full text search caliberated, add advanced search support
Merge remote-tracking branch 'origin/develop-v2'