AGSTAFF-15 Fixed search capability