Improve room filters behavior