AMCAT-8 #resolved use keywordsearch query rather than table to fix length 10 problem