smart group search regression on location

CRM-14263 contains a fix for search profiles changing. In that fix is a change to the table alias name because table aliases like 1-address are invalid but 1_address isn't.

However, historical smart groups are affected by this as the pass in the tablename - e.g Billing-address

It turns out that the query object uses invalid table names & then encapsulates them with '`' - so I need to revert the previous fix (which switched to a valid sql tablename ) & instead encapsulate the query-object style one