The BP published this article today, listing 39 categories of professions reserved for Thais. I don't see "massage" or "entertainment" among them.  Perhaps they're lumped under labour work.

 

From Bangkok Post

 

The Employment Department will revise the list of 39 professions reserved for Thai citizens to accommodate the changing circumstances of Thai workers.
 

Director-general Varanon Peetiwan said on Wednesday the list had not been updated for a long time, but the circumstances of Thai society had changed. The list included bricklaying which proved not to interest Thai workers any longer, he said.

The number of reserved professions was 39 but the cabinet had already allowed migrants to work as labourers and domestic helpers, Mr Varanon said.

 

The Employment Department would invite representatives of professions to help revise the list to better respond to situation and economic condition, he said.

 

The 1979 list of reserved professions comprised:

 

(list continues at)

http://www.bangkokpost.com/news/general/1290075/list-of-jobs-reserved-for-thais-to-be-revised

Shop/attendance is listed there, hmmm. But no specific definition of the kind of shop, thus leaving it expose for extortion from the police.