added functionality for reset button + misc filtering bugfixes