Fix overzealous request filter; fix potential SQL security issues with
query