Make keyword queries extensible