Fixed search for multiple keywords and int - Fixes #20