change FILTER keyword to non-reserved per discussion

(the grammar changes merged from master now no longer require that
filter be reserved to avoid conflicts in the from-clause case)