Added support for uppercase query keywords