Default argument fix for handler_filter.query