WP-1320 use discovery filters

http://jira.webinos.org/browse/WP-1320