Feature/filters

Added support for more advanced filtering