Filtering bugfix and styling changes