Conversions: Adding regex guard to queries