Remove private methods from AlfrescoContent and remove modification of query statements in SearchService