Cleaned up old references to the free text search and fixed a merge issue that removed 4 constants.