fix filtering by removing all dbEscaping
remove unneccessary ecaping and quoting