Fix some filtering issues, the quotes were throwing some exceptions