Esc closes menu & filter fix