Merge lp:~stolowski/unity-scopes-shell/social-attributes into lp:unity-scopes-shell

[Paweł Stołowski]

Handle social-actions.

Handle social-actions. Needs https://code.launchpad.net/~stolowski/unity-api/social-attributes-role/+merge/287802

[lp:~stolowski/unity-scopes-shell/social-attributes]

293. By Paweł Stołowski on 2016-03-03

Renamed to social-actions

294. By Paweł Stołowski on 2016-03-04

Provide unity-scopes-impl-10

295. By Paweł Stołowski on 2016-03-07

Merged trunk

296. By Paweł Stołowski on 2016-03-16

Merged filters

297. By Paweł Stołowski on 2016-03-24

Merged trunk

298. By Paweł Stołowski on 2016-03-24

Bump dependencies

299. By Paweł Stołowski on 2016-03-29

Debug

300. By Paweł Stołowski on 2016-03-29

Updated CATEGORY_JSON_DEFAULTS

301. By Paweł Stołowski on 2016-03-29

Fix updated CATEGORY_JSON_DEFAULTS

302. By Paweł Stołowski on 2016-03-29

Fix test failure

303. By Paweł Stołowski on 2016-03-29

Removed extra debug

304. By Paweł Stołowski on 2016-03-29

Debug updateResult

305. By Paweł Stołowski on 2016-03-29

Debug

306. By Paweł Stołowski on 2016-04-14

Merged trunk

307. By Paweł Stołowski on 2016-04-15

Bump

308. By Paweł Stołowski on 2016-04-26

Bump

309. By Paweł Stołowski on 2016-04-26

Fix version

310. By Paweł Stołowski on 2016-04-26

Fix version

311. By Paweł Stołowski on 2016-05-05

Merged trunk

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-18 15:46:26 +0000
+++ CMakeLists.txt	2016-03-16 11:17:35 +0000
@@ -50,8 +50,8 @@
 find_package(Qt5Test)
 find_package(Boost COMPONENTS regex REQUIRED)
 
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=1.0.1)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=1.0.4)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=11)
 
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-26 12:38:34 +0000
+++ debian/changelog	2016-03-16 11:17:35 +0000
@@ -1,3 +1,9 @@
+unity-scopes-shell (0.5.7-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Preliminary support for filters.
+
+ -- Pawel Stolowski <[e-mail]>  Fri, 30 Oct 2015 16:17:55 +0100
+
 unity-scopes-shell (0.5.6+16.04.20160226.1-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]
@@ -104,10 +110,6 @@
   * Call parent class ::event (LP: #1495467)
   * Improvements from running clazy over the code
 
-  [ CI Train Bot ]
-  * Improvements from running clazy over the code
-  * New rebuild forced.
-
  -- Pawel Stolowski <[e-mail]>  Thu, 24 Sep 2015 12:44:30 +0000
 
 unity-scopes-shell (0.5.5+15.10.20150922-0ubuntu1) wily; urgency=medium

=== modified file 'debian/control.in'
--- debian/control.in	2016-02-18 15:46:26 +0000
+++ debian/control.in	2016-03-16 11:17:35 +0000
@@ -8,8 +8,8 @@
                dh-python,
                libboost-python-dev,
                libboost-regex-dev,
-               libunity-api-dev (>= 7.107),
-               libunity-scopes-dev (>= 1.0.1~),
+               libunity-api-dev (>= 7.108),
+               libunity-scopes-dev (>= 1.0.4~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
                libqtdbusmock1-dev (>= 0.2),
@@ -51,6 +51,7 @@
           unity-scopes-impl-8,
           unity-scopes-impl-9,
           unity-scopes-impl-10,
+          unity-scopes-impl-11,
 Breaks: unity8-private (<< 7.84),
         unity8 (<< 8.11)
 Replaces: unity8-private (<< 7.84)

=== modified file 'debian/libscope-harness.symbols.in'
--- debian/libscope-harness.symbols.in	2016-02-26 12:38:34 +0000
+++ debian/libscope-harness.symbols.in	2016-03-16 11:17:35 +0000
@@ -271,6 +271,7 @@
  (c++)"unity::scopeharness::TestUtils::throwIfNot(bool, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::TestUtils::waitForResultsChange(QSharedPointer<unity::shell::scopes::ScopeInterface>)@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::TestUtils::waitForSearchFinish(QSharedPointer<unity::shell::scopes::ScopeInterface>)@Base" 0.5.4+15.04.20150311.3
+ (c++)"unity::scopeharness::TestUtils::waitForFilterStateChange(QSharedPointer<unity::shell::scopes::ScopeInterface>)@Base" 0replaceme
  (c++)"unity::scopeharness::view::AbstractView::~AbstractView()@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::view::PreviewView::columnCount() const@Base" 0.5.4+15.04.20150311.3
  (c++)"unity::scopeharness::view::PreviewView::~PreviewView()@Base" 0.5.4+15.04.20150311.3

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2016-02-11 15:35:47 +0000
+++ po/POTFILES.in	2016-03-16 11:17:35 +0000
@@ -1,14 +1,18 @@
 tools/location/main.cpp
 tests/resultstest.cpp
+tests/filterstest.cpp
 tests/settingsendtoendtest.cpp
 tests/utilstest.cpp
 tests/previewtest.cpp
 tests/overviewtest.cpp
 tests/departmentstest.cpp
 tests/locationtest.cpp
+tests/filtersendtoendtest.cpp
 tests/favoritestest.cpp
+tests/optionselectorfiltertest.cpp
 tests/data/scopes/scopes.cpp
 tests/data/mock-scope-departments/mock-scope-departments.cpp
+tests/data/mock-scope-filters/mock-scope-filters.cpp
 tests/data/mock-scope-ttl/mock-scope-ttl.cpp
 tests/data/mock-scope-info/mock-scope-info.cpp
 tests/data/mock-scope-departments-flipflop/mock-scope-departments-flipflop.cpp
@@ -71,8 +75,11 @@
 src/Unity/geoip.cpp
 src/Unity/plugin.cpp
 src/Unity/scopes.cpp
+src/Unity/filters.cpp
+src/Unity/optionselectoroptions.cpp
 src/Unity/settingsmodel.cpp
 src/Unity/utils.cpp
+src/Unity/optionselectorfilter.cpp
 src/Unity/resultsmap.cpp
 src/Unity/locationservice.cpp
 src/Unity/ubuntulocationservice.cpp
@@ -117,7 +124,9 @@
 src/scope-harness/view/results-view.h
 src/scope-harness/view/preview-view.h
 src/scope-harness/view/abstract-view.h
+src/Unity/optionselectoroptions.h
 src/Unity/iconutils.h
+src/Unity/optionselectorfilter.h
 src/Unity/ubuntulocationservice.h
 src/Unity/localization.h
 src/Unity/previewmodel.h
@@ -126,8 +135,10 @@
 src/Unity/plugin.h
 src/Unity/department.h
 src/Unity/scope.h
+src/Unity/filters.h
 src/Unity/logintoaccount.h
 src/Unity/overviewcategories.h
+src/Unity/modelupdate.h
 src/Unity/locationservice.h
 src/Unity/overviewscope.h
 src/Unity/settingsmodel.h

=== modified file 'po/am.po'
--- po/am.po	2016-03-05 06:20:25 +0000
+++ po/am.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-28 19:12+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/ar.po'
--- po/ar.po	2016-03-05 06:20:25 +0000
+++ po/ar.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-18 12:07+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/br.po'
--- po/br.po	2016-03-05 06:20:25 +0000
+++ po/br.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 12:51+0000\n"
 "Last-Translator: Rouxel <[e-mail]>\n"
 "Language-Team: Breton <[e-mail]>\n"
+"Language: br\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/ca.po'
--- po/ca.po	2016-03-05 06:20:25 +0000
+++ po/ca.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 05:42+0000\n"
 "Last-Translator: David Planella <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/cs.po'
--- po/cs.po	2016-03-05 06:20:25 +0000
+++ po/cs.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2016-02-09 08:56+0000\n"
 "Last-Translator: Vojtěch Daněk <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/da.po'
--- po/da.po	2016-03-05 06:20:25 +0000
+++ po/da.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-06-03 19:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Danish <[e-mail]>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/de.po'
--- po/de.po	2016-03-05 06:20:25 +0000
+++ po/de.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-19 19:11+0000\n"
 "Last-Translator: Phillip Sz <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/el.po'
--- po/el.po	2016-03-05 06:20:25 +0000
+++ po/el.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 09:19+0000\n"
 "Last-Translator: Simos Xenitellis <Unknown>\n"
 "Language-Team: Greek <[e-mail]>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2016-03-05 06:20:25 +0000
+++ po/en_GB.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2016-02-03 11:21+0000\n"
 "Last-Translator: James Tait <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/eo.po'
--- po/eo.po	2016-03-05 06:20:25 +0000
+++ po/eo.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 09:53+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Esperanto <[e-mail]>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/es.po'
--- po/es.po	2016-03-05 06:20:25 +0000
+++ po/es.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 09:48+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/eu.po'
--- po/eu.po	2016-03-05 06:20:25 +0000
+++ po/eu.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 07:02+0000\n"
 "Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
 "Language-Team: Basque <[e-mail]>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/fa.po'
--- po/fa.po	2016-03-05 06:20:25 +0000
+++ po/fa.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 12:38+0000\n"
 "Last-Translator: Danial Behzadi <[e-mail]>\n"
 "Language-Team: Persian <[e-mail]>\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/fi.po'
--- po/fi.po	2016-03-05 06:20:25 +0000
+++ po/fi.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 07:13+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <[e-mail]>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/fr.po'
--- po/fr.po	2016-03-05 06:20:25 +0000
+++ po/fr.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-17 11:19+0000\n"
 "Last-Translator: Nicolas Delvaux <Unknown>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/gd.po'
--- po/gd.po	2016-03-05 06:20:25 +0000
+++ po/gd.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-06-17 14:57+0000\n"
 "Last-Translator: GunChleoc <Unknown>\n"
 "Language-Team: Gaelic; Scottish <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/gl.po'
--- po/gl.po	2016-03-05 06:20:25 +0000
+++ po/gl.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 09:18+0000\n"
 "Last-Translator: Marcos Lans <Unknown>\n"
 "Language-Team: Galician <[e-mail]>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/hu.po'
--- po/hu.po	2016-03-05 06:20:25 +0000
+++ po/hu.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 06:19+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/it.po'
--- po/it.po	2016-03-05 06:20:25 +0000
+++ po/it.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 06:11+0000\n"
 "Last-Translator: Milo Casagrande <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/ja.po'
--- po/ja.po	2016-03-05 06:20:25 +0000
+++ po/ja.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 07:23+0000\n"
 "Last-Translator: Mitsuya Shibata <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/nb.po'
--- po/nb.po	2016-03-05 06:20:25 +0000
+++ po/nb.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 10:49+0000\n"
 "Last-Translator: Åka Sikrom <Unknown>\n"
 "Language-Team: Norwegian Bokmal <[e-mail]>\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/nl.po'
--- po/nl.po	2016-03-05 06:20:25 +0000
+++ po/nl.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 14:53+0000\n"
 "Last-Translator: Hannie Dumoleyn <Unknown>\n"
 "Language-Team: Dutch <[e-mail]>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/pl.po'
--- po/pl.po	2016-03-05 06:20:25 +0000
+++ po/pl.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-30 15:26+0000\n"
 "Last-Translator: Krzysztof Tataradziński <Unknown>\n"
 "Language-Team: Polish <[e-mail]>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/pt.po'
--- po/pt.po	2016-03-05 06:20:25 +0000
+++ po/pt.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-29 10:01+0000\n"
 "Last-Translator: Ivo Xavier <[e-mail]>\n"
 "Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2016-03-05 06:20:25 +0000
+++ po/pt_BR.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-08-05 04:40+0000\n"
 "Last-Translator: Tiago Hillebrandt <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/ru.po'
--- po/ru.po	2016-03-05 06:20:25 +0000
+++ po/ru.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 05:57+0000\n"
 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/sl.po'
--- po/sl.po	2016-03-05 06:20:25 +0000
+++ po/sl.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-20 05:29+0000\n"
 "Last-Translator: Sasa Batistic <Unknown>\n"
 "Language-Team: Slovenian <[e-mail]>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/sv.po'
--- po/sv.po	2016-03-05 06:20:25 +0000
+++ po/sv.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-08-05 08:33+0000\n"
 "Last-Translator: Josef Andersson <Unknown>\n"
 "Language-Team: Swedish <[e-mail]>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/ta.po'
--- po/ta.po	2016-03-05 06:20:25 +0000
+++ po/ta.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-07-16 08:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Tamil <[e-mail]>\n"
+"Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/uk.po'
--- po/uk.po	2016-03-05 06:20:25 +0000
+++ po/uk.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2016-02-08 18:50+0000\n"
 "Last-Translator: Yuri Chornoivan <[e-mail]>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/unity-plugin-scopes.pot'
--- po/unity-plugin-scopes.pot	2015-09-28 08:41:08 +0000
+++ po/unity-plugin-scopes.pot	2016-03-16 11:17:35 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'po/zh_TW.po'
--- po/zh_TW.po	2016-03-05 06:20:25 +0000
+++ po/zh_TW.po	2016-03-16 11:17:35 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: unity-scopes-shell\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-09-28 08:40+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-09-01 10:42+0000\n"
 "PO-Revision-Date: 2015-10-21 05:47+0000\n"
 "Last-Translator: Rex Tsai <[e-mail]>\n"
 "Language-Team: Chinese (Traditional) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2016-02-11 15:35:47 +0000
+++ src/Unity/CMakeLists.txt	2016-03-16 11:17:35 +0000
@@ -20,6 +20,12 @@
     collectors.cpp
     department.cpp
     departmentnode.cpp
+    filters.cpp
+    optionselectorfilter.cpp
+    optionselectoroptions.cpp
+    rangeinputfilter.cpp
+    valuesliderfilter.cpp
+    valueslidervalues.cpp
     geoip.cpp
     localization.h
     locationservice.cpp
@@ -39,6 +45,13 @@
     logintoaccount.cpp
     # We need these headers here so moc runs and we get the moc-stuff
     # compiled in, otherwise we miss some symbols
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/FiltersInterface.h
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/FilterBaseInterface.h
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/OptionSelectorFilterInterface.h
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/OptionSelectorOptionsInterface.h
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/RangeInputFilterInterface.h
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderFilterInterface.h
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ValueSliderValuesInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/NavigationInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewModelInterface.h

=== modified file 'src/Unity/collectors.cpp'
--- src/Unity/collectors.cpp	2015-10-05 12:29:55 +0000
+++ src/Unity/collectors.cpp	2016-03-16 11:17:35 +0000
@@ -142,19 +142,13 @@
         m_rootDepartment = department;
     }
 
-    void setSortOrder(scopes::OptionSelectorFilter::SCPtr const& sortOrder)
-    {
-        QMutexLocker locker(&m_mutex);
-        m_sortOrderFilter = sortOrder;
-    }
-
-    void setFilterState(scopes::FilterState const& state)
-    {
-        QMutexLocker locker(&m_mutex);
-        m_filterState = state;
-    }
-
-    Status collect(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& out_rootDepartment, scopes::OptionSelectorFilter::SCPtr& out_sortOrder, scopes::FilterState& out_filterState)
+    void addFilter(scopes::FilterBase::SCPtr const& filter)
+    {
+        QMutexLocker locker(&m_mutex);
+        m_filters.append(filter);
+    }
+
+    Status collect(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& out_rootDepartment, QList<scopes::FilterBase::SCPtr>& out_filters)
     {
         Status status;
 
@@ -167,8 +161,7 @@
         m_results.swap(out_results);
         out_rootDepartment = m_rootDepartment;
 
-        out_sortOrder = m_sortOrderFilter;
-        out_filterState = m_filterState;
+        out_filters = m_filters;
 
         return status;
     }
@@ -176,8 +169,7 @@
 private:
     QList<scopes::CategorisedResult::SPtr> m_results;
     scopes::Department::SCPtr m_rootDepartment;
-    scopes::OptionSelectorFilter::SCPtr m_sortOrderFilter;
-    scopes::FilterState m_filterState;
+    QList<scopes::FilterBase::SCPtr> m_filters;
 };
 
 class PreviewDataCollector: public CollectorBase
@@ -292,10 +284,11 @@
     return m_collector->msecsSinceStart();
 }
 
-CollectorBase::Status PushEvent::collectSearchResults(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& rootDepartment, scopes::OptionSelectorFilter::SCPtr& sortOrder, scopes::FilterState& filterState)
+CollectorBase::Status PushEvent::collectSearchResults(QList<scopes::CategorisedResult::SPtr>& out_results, scopes::Department::SCPtr& rootDepartment,
+        QList<scopes::FilterBase::SCPtr>& out_filters)
 {
     auto collector = std::dynamic_pointer_cast<SearchDataCollector>(m_collector);
-    return collector->collect(out_results, rootDepartment, sortOrder, filterState);
+    return collector->collect(out_results, rootDepartment, out_filters);
 }
 
 CollectorBase::Status PushEvent::collectPreviewData(scopes::ColumnLayoutList& out_columns, scopes::PreviewWidgetList& out_widgets, QHash<QString, QVariant>& out_data)
@@ -358,21 +351,12 @@
     m_collector->setDepartment(department);
 }
 
-void SearchResultReceiver::push(scopes::Filters const& filters, scopes::FilterState const& state)
+void SearchResultReceiver::push(scopes::Filters const& filters, scopes::FilterState const& /* state */)
 {
     for (auto it = filters.begin(); it != filters.end(); ++it) {
         scopes::FilterBase::SCPtr filter = *it;
-        if (filter->display_hints() == scopes::FilterBase::DisplayHints::Primary) {
-            scopes::OptionSelectorFilter::SCPtr option_filter = std::dynamic_pointer_cast<const scopes::OptionSelectorFilter>(filter);
-            if (!option_filter) {
-                continue;
-            } else {
-                m_collector->setSortOrder(option_filter);
-                break;
-            }
-        }
+        m_collector->addFilter(filter);
     }
-    m_collector->setFilterState(state);
 }
 
 // this might be called from any thread (might be main, might be any other thread)

=== modified file 'src/Unity/collectors.h'
--- src/Unity/collectors.h	2016-02-17 16:32:49 +0000
+++ src/Unity/collectors.h	2016-03-16 11:17:35 +0000
@@ -76,7 +76,8 @@
     PushEvent(Type event_type, const std::shared_ptr<CollectorBase>& collector);
     Type type();
 
-    CollectorBase::Status collectSearchResults(QList<std::shared_ptr<unity::scopes::CategorisedResult>>& out_results, unity::scopes::Department::SCPtr& out_rootDepartment, unity::scopes::OptionSelectorFilter::SCPtr& out_sortOrder, unity::scopes::FilterState& out_filterState);
+    CollectorBase::Status collectSearchResults(QList<std::shared_ptr<unity::scopes::CategorisedResult>>& out_results, unity::scopes::Department::SCPtr&
+            out_rootDepartment, QList<unity::scopes::FilterBase::SCPtr>& out_filters);
     CollectorBase::Status collectPreviewData(unity::scopes::ColumnLayoutList& out_columns, unity::scopes::PreviewWidgetList& out_widgets, QHash<QString, QVariant>& out_data);
     CollectorBase::Status collectActivationResponse(std::shared_ptr<unity::scopes::ActivationResponse>& out_response, std::shared_ptr<unity::scopes::Result>&
             out_result, QString& categoryId);

=== modified file 'src/Unity/department.cpp'
--- src/Unity/department.cpp	2015-09-08 12:32:05 +0000
+++ src/Unity/department.cpp	2016-03-16 11:17:35 +0000
@@ -65,6 +65,7 @@
         QSharedPointer<SubdepartmentData> subdept(new SubdepartmentData);
         subdept->id = node->id();
         subdept->label = node->label();
+        subdept->allLabel = node->allLabel();
         subdept->hasChildren = node->hasSubdepartments();
         subdept->isActive = false;
         m_subdepartments.append(subdept);
@@ -122,12 +123,23 @@
     switch (role) {
         case RoleNavigationId: return data->id;
         case RoleLabel: return data->label;
+        case RoleAllLabel: return data->allLabel;
         case RoleHasChildren: return data->hasChildren;
         case RoleIsActive: return data->isActive;
         default: return QVariant();
     }
 }
 
+QSharedPointer<SubdepartmentData> Department::findSubdepartment(const QString &id) const
+{
+    for (auto sub: m_subdepartments) {
+        if (sub->id == id) {
+            return sub;
+        }
+    }
+    return QSharedPointer<SubdepartmentData>();
+}
+
 int Department::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);

=== modified file 'src/Unity/department.h'
--- src/Unity/department.h	2014-08-04 15:06:55 +0000
+++ src/Unity/department.h	2016-03-16 11:17:35 +0000
@@ -40,6 +40,7 @@
 {
     QString id;
     QString label;
+    QString allLabel;
     bool hasChildren;
     bool isActive;
 };
@@ -67,6 +68,8 @@
     bool hidden() const override;
     int count() const override;
 
+    QSharedPointer<SubdepartmentData> findSubdepartment(const QString &id) const;
+
 Q_SIGNALS:
 
 private:

=== added file 'src/Unity/filters.cpp'
--- src/Unity/filters.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/filters.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,281 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// Self
+#include "filters.h"
+#include "optionselectorfilter.h"
+#include "rangeinputfilter.h"
+#include "valuesliderfilter.h"
+#include <QSet>
+#include <QMap>
+#include <QQmlEngine>
+#include <QDebug>
+
+#include <unity/scopes/OptionSelectorFilter.h>
+#include <unity/scopes/RangeInputFilter.h>
+#include <unity/scopes/ValueSliderFilter.h>
+
+namespace scopes_ng
+{
+
+const int FILTER_CHANGE_PROCESSING_DELAY = 300;
+
+Filters::Filters(unity::scopes::FilterState const& filterState,
+        unity::shell::scopes::ScopeInterface *parent) : ModelUpdate(parent),
+        m_filterState(new unity::scopes::FilterState(filterState))
+{
+    m_filterStateChangeTimer.setSingleShot(true);
+    QObject::connect(&m_filterStateChangeTimer, &QTimer::timeout, this, &Filters::delayedFilterStateChange);
+}
+
+int Filters::rowCount(const QModelIndex&) const
+{
+    return m_filters.count();
+}
+
+QVariant Filters::data(const QModelIndex& index, int role) const
+{
+    if (index.row() >= m_filters.count())
+    {
+        return QVariant();
+    }
+
+    switch (role)
+    {
+        case unity::shell::scopes::FiltersInterface::Roles::RoleFilterId:
+            return m_filters.at(index.row())->filterId();
+        case Qt::DisplayRole:
+        case unity::shell::scopes::FiltersInterface::Roles::RoleFilterType:
+            return m_filters.at(index.row())->filterType();
+        case unity::shell::scopes::FiltersInterface::Roles::RoleFilter:
+            return QVariant::fromValue(m_filters.at(index.row()).data());
+        default:
+            break;
+    };
+
+    return QVariant();
+}
+
+void Filters::clear()
+{
+    if (m_filters.size() > 0)
+    {
+        beginResetModel();
+        m_filters.clear();
+        m_filterState.reset(new unity::scopes::FilterState());
+        endResetModel();
+    }
+}
+
+void Filters::reset()
+{
+    // Resetting filters will emit filterStateChanged.
+    qDebug() << "Resetting filters to defaults";
+    for (auto f: m_filters) {
+        qDebug() << "Resetting filter:" << f->filterId();
+        auto shellFilter = dynamic_cast<FilterUpdateInterface*>(f.data());
+        Q_ASSERT(shellFilter);
+        shellFilter->reset();
+    }
+}
+
+void Filters::onFilterStateChanged()
+{
+    qDebug() << "Filter::onFilterStateChanged";
+    m_filterStateChangeTimer.start(FILTER_CHANGE_PROCESSING_DELAY);
+}
+
+void Filters::delayedFilterStateChange()
+{
+    Q_EMIT filterStateChanged();
+}
+
+void Filters::update(QList<unity::scopes::FilterBase::SCPtr> const& filters, bool containsDepartments)
+{
+    // Primary filter needs to be handled separately and not inserted into the main filters model,
+    bool hasPrimaryFilter = containsDepartments;
+    QList<unity::scopes::FilterBase::SCPtr> inFilters;
+    for (auto f: filters) {
+        // we can only have one primary filter. only a single-selection OptionSelectorFilter can be a primary nav.
+        bool wantsToBePrimary = (f->display_hints() & unity::scopes::FilterBase::DisplayHints::Primary);
+        unity::scopes::OptionSelectorFilter::SCPtr optSelFilter = std::dynamic_pointer_cast<unity::scopes::OptionSelectorFilter const>(f);
+        if (optSelFilter == nullptr || optSelFilter->multi_select()) {
+            wantsToBePrimary = false;
+        }
+        if (wantsToBePrimary && !hasPrimaryFilter) {
+            hasPrimaryFilter = true;
+            //
+            const bool hadSamePrimaryFilterBefore = m_primaryFilter && (m_primaryFilter->filterId() == QString::fromStdString(f->id())) && (m_primaryFilter->filterType() == getFilterType(f));
+            if (hadSamePrimaryFilterBefore) {
+                auto shellFilter = dynamic_cast<FilterUpdateInterface*>(m_primaryFilter.data());
+                if (shellFilter) {
+                    shellFilter->update(f);
+                } else {
+                    // this should never happen
+                    qCritical() << "Failed to cast filter" << m_primaryFilter->filterId() << "to FilterUpdateInterface";
+                }
+            } else {
+                // we didn't have primary filter before, or it changed substantially, so recreate it
+                m_primaryFilter = createFilterObject(f);
+                Q_EMIT primaryFilterChanged();
+            }
+        } else {
+            inFilters.append(f);
+        }
+    }
+
+    // Did we have primary filter before but not now?
+    if (!hasPrimaryFilter && m_primaryFilter != nullptr) {
+        m_primaryFilter.reset();
+        Q_EMIT primaryFilterChanged();
+    }
+
+    syncModel(inFilters, m_filters,
+            // key function for scopes api filter
+            [](const unity::scopes::FilterBase::SCPtr& f) -> QString { return QString::fromStdString(f->id()); },
+            // key function for shell api filter
+            [](const QSharedPointer<unity::shell::scopes::FilterBaseInterface>& f) -> QString { return f->filterId(); },
+            // factory function
+            [this](const unity::scopes::FilterBase::SCPtr& f) -> QSharedPointer<unity::shell::scopes::FilterBaseInterface> {
+                return createFilterObject(f);
+                },
+            // filter update function
+            [this](int, const unity::scopes::FilterBase::SCPtr &f1, const QSharedPointer<unity::shell::scopes::FilterBaseInterface>& f2) -> bool {
+                qDebug() << "Updating filter" << f2->filterId();
+                if (f2->filterId() != QString::fromStdString(f1->id()) || f2->filterType() != getFilterType(f1))
+                {
+                    return false;
+                }
+                auto shellFilter = dynamic_cast<FilterUpdateInterface*>(f2.data());
+                if (shellFilter) {
+                    shellFilter->update(f1);
+                } else {
+                    // this should never happen
+                    qCritical() << "Failed to cast filter" << f2->filterId() << "to FilterUpdateInterface";
+                }
+                return true;
+            });
+}
+//
+// Update current filters model and primary filter pointer with filters coming from scope.
+void Filters::update(unity::scopes::FilterState const& filterState)
+{
+    m_filterState.reset(new unity::scopes::FilterState(filterState));
+
+    if (m_primaryFilter) {
+        auto shellFilter = dynamic_cast<FilterUpdateInterface*>(m_primaryFilter.data());
+        if (shellFilter) {
+            shellFilter->update(m_filterState);
+        } else {
+            // this should never happen
+            qCritical() << "Failed to cast filter" << m_primaryFilter->filterId() << "to FilterUpdateInterface";
+        }
+    }
+    for (auto f: m_filters) {
+        auto shellFilter = dynamic_cast<FilterUpdateInterface*>(f.data());
+        if (shellFilter) {
+            shellFilter->update(m_filterState);
+        } else {
+            // this should never happen
+            qCritical() << "Failed to cast filter" << f->filterId() << "to FilterUpdateInterface";
+        }
+    }
+}
+
+QSharedPointer<unity::shell::scopes::FilterBaseInterface> Filters::createFilterObject(unity::scopes::FilterBase::SCPtr const& filter)
+{
+    QSharedPointer<unity::shell::scopes::FilterBaseInterface> filterObj;
+    if (filter->filter_type() == "option_selector")
+    {
+        unity::scopes::OptionSelectorFilter::SCPtr optfilter = std::dynamic_pointer_cast<unity::scopes::OptionSelectorFilter const>(filter);
+        filterObj = QSharedPointer<unity::shell::scopes::FilterBaseInterface>(new scopes_ng::OptionSelectorFilter(optfilter, m_filterState, this));
+    }
+    else if (filter->filter_type() == "range_input")
+    {
+        unity::scopes::RangeInputFilter::SCPtr rangefilter = std::dynamic_pointer_cast<unity::scopes::RangeInputFilter const>(filter);
+        filterObj = QSharedPointer<unity::shell::scopes::FilterBaseInterface>(new scopes_ng::RangeInputFilter(rangefilter, m_filterState, this));
+    }
+    else if (filter->filter_type() == "value_slider")
+    {
+        unity::scopes::ValueSliderFilter::SCPtr valuesliderfilter = std::dynamic_pointer_cast<unity::scopes::ValueSliderFilter const>(filter);
+        filterObj = QSharedPointer<unity::shell::scopes::FilterBaseInterface>(new scopes_ng::ValueSliderFilter(valuesliderfilter, m_filterState, this));
+    }
+
+    // Warning!!! Make sure any new filter type created by this factory method is reflected below in getFilterType() method as well!
+
+    if (filterObj)
+    {
+        QQmlEngine::setObjectOwnership(filterObj.data(), QQmlEngine::CppOwnership);
+        connect(filterObj.data(), SIGNAL(filterStateChanged()), this, SLOT(onFilterStateChanged()));
+    }
+    else
+    {
+        qWarning() << "Unsupported filter type:" << QString::fromStdString(filter->filter_type());
+    }
+
+    return filterObj;
+}
+
+unity::shell::scopes::FiltersInterface::FilterType Filters::getFilterType(unity::scopes::FilterBase::SCPtr const& filter)
+{
+    // WARNING! Some filters may rely on inheritance, in that case the dynamic casts below need to be in correct order
+    // (e.g. more concrete types first, base/generic types last).
+    if (std::dynamic_pointer_cast<unity::scopes::OptionSelectorFilter const>(filter))
+    {
+        return unity::shell::scopes::FiltersInterface::FilterType::OptionSelectorFilter;
+    }
+    if (std::dynamic_pointer_cast<unity::scopes::RangeInputFilter const>(filter))
+    {
+        return unity::shell::scopes::FiltersInterface::FilterType::RangeInputFilter;
+    }
+    if (std::dynamic_pointer_cast<unity::scopes::ValueSliderFilter const>(filter))
+    {
+        return unity::shell::scopes::FiltersInterface::FilterType::ValueSliderFilter;
+    }
+    qFatal("getFilterType(): Unknown filter type: %s\n", filter->filter_type().c_str());
+    return unity::shell::scopes::FiltersInterface::FilterType::Invalid;
+}
+
+unity::scopes::FilterState Filters::filterState() const
+{
+    if (m_filterState) {
+        return *m_filterState;
+    }
+    return unity::scopes::FilterState();
+}
+
+QSharedPointer<unity::shell::scopes::FilterBaseInterface> Filters::primaryFilter() const
+{
+    return m_primaryFilter;
+}
+
+int Filters::activeFiltersCount() const
+{
+    int count = 0;
+    for (auto filter: m_filters) {
+        auto shellFilter = dynamic_cast<FilterUpdateInterface*>(filter.data());
+        if (shellFilter->isActive()) {
+            qDebug() << "activeFiltersCount: filter" << filter->filterId() << "is active";
+            ++count;
+        }
+    }
+    return count;
+}
+
+}

=== added file 'src/Unity/filters.h'
--- src/Unity/filters.h	1970-01-01 00:00:00 +0000
+++ src/Unity/filters.h	2016-03-16 11:17:35 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NG_FILTERS_H
+#define NG_FILTERS_H
+
+#include <unity/shell/scopes/FiltersInterface.h>
+#include <unity/shell/scopes/ScopeInterface.h>
+#include <unity/scopes/FilterBase.h>
+#include <unity/scopes/FilterState.h>
+#include <unity/shell/scopes/FilterBaseInterface.h>
+#include "modelupdate.h"
+
+#include <QList>
+#include <QSharedPointer>
+#include <QTimer>
+
+namespace scopes_ng
+{
+
+class FilterUpdateInterface
+{
+    public:
+        // Apply potential updates of filter definition coming from scope.
+        virtual void update(unity::scopes::FilterBase::SCPtr const& filter) = 0;
+
+        // Apply filter state change (e.g. after user executed a canned query).
+        virtual void update(unity::scopes::FilterState::SPtr const& filterState) = 0;
+
+        // Check if the filter is active (i.e. has non-default values set).
+        virtual bool isActive() const = 0;
+
+        // Reset filter to defaults.
+        virtual void reset() = 0;
+};
+
+class Q_DECL_EXPORT Filters :
+    public ModelUpdate<unity::shell::scopes::FiltersInterface,
+        QList<unity::scopes::FilterBase::SCPtr>,
+        QList<QSharedPointer<unity::shell::scopes::FilterBaseInterface>>>
+{
+    Q_OBJECT
+
+public:
+    explicit Filters(unity::scopes::FilterState const& filterState, unity::shell::scopes::ScopeInterface *parent = nullptr);
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    void update(QList<unity::scopes::FilterBase::SCPtr> const& filters, bool containsDepartments = false);
+    void update(unity::scopes::FilterState const& filterState);
+
+    unity::scopes::FilterState filterState() const;
+    QSharedPointer<unity::shell::scopes::FilterBaseInterface> primaryFilter() const;
+    int activeFiltersCount() const;
+
+public Q_SLOTS:
+    void clear();
+    void reset();
+
+private Q_SLOTS:
+    void onFilterStateChanged();
+    void delayedFilterStateChange();
+
+Q_SIGNALS:
+    void filterStateChanged();
+    void primaryFilterChanged();
+
+private:
+    static unity::shell::scopes::FiltersInterface::FilterType getFilterType(unity::scopes::FilterBase::SCPtr const& filter);
+    QSharedPointer<unity::shell::scopes::FilterBaseInterface> createFilterObject(unity::scopes::FilterBase::SCPtr const& filter);
+    QList<QSharedPointer<unity::shell::scopes::FilterBaseInterface>> m_filters;
+    QSharedPointer<unity::shell::scopes::FilterBaseInterface> m_primaryFilter;
+    unity::scopes::FilterState::SPtr m_filterState;
+    QTimer m_filterStateChangeTimer;
+};
+
+} // namespace scopes_ng
+
+#endif

=== added file 'src/Unity/modelupdate.h'
--- src/Unity/modelupdate.h	1970-01-01 00:00:00 +0000
+++ src/Unity/modelupdate.h	2016-03-16 11:17:35 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NG_MODEL_UPDATE_H
+#define NG_MODEL_UPDATE_H
+
+#include <QSet>
+#include <functional>
+
+template <class ModelBase, class InputContainer, class OutputContainer, class KeyType=QString>
+class ModelUpdate: public ModelBase
+{
+public:
+    using InputKeyFunc = std::function<KeyType(typename InputContainer::value_type)>;
+    using OutputKeyFunc = std::function<KeyType(typename OutputContainer::value_type)>;
+    using CreateFunc = std::function<typename OutputContainer::value_type(typename InputContainer::value_type const&)>;
+    using UpdateFunc = std::function<bool(int, typename InputContainer::value_type const&, typename OutputContainer::value_type const&)>;
+
+    ModelUpdate(QObject *parent = nullptr): ModelBase(parent) {}
+
+    void syncModel(InputContainer const& input,
+            OutputContainer &model,
+            const InputKeyFunc& inKeyFunc,
+            const OutputKeyFunc& outKeyFunc,
+            const CreateFunc& createFunc,
+            const UpdateFunc& updateFunc)
+    {
+        QMap<KeyType, int> newItems; // lookup for recevied objects and their desired rows in the model
+        QSet<KeyType> oldItems; // lookup for objects that were already displayed
+
+        {
+            int pos = 0;
+            for (auto item: input)
+            {
+                newItems[inKeyFunc(item)] = pos++;
+            }
+        }
+
+        // iterate over old objects, remove objects that are not present anymore
+        {
+            int row = 0;
+            for (auto it = model.begin(); it != model.end();)
+            {
+                const KeyType id = outKeyFunc(*it);
+                if (!newItems.contains(id))
+                {
+                    this->beginRemoveRows(QModelIndex(), row, row);
+                    it = model.erase(it);
+                    this->endRemoveRows();
+                }
+                else
+                {
+                    oldItems.insert(id);
+                    ++it;
+                    ++row;
+                }
+            }
+        }
+
+        // iterate over new objects and insert them in the model
+        {
+            int row = 0;
+            for (auto const& item: input)
+            {
+                if (!oldItems.contains(inKeyFunc(item)))
+                {
+                    auto obj = createFunc(item);
+                    if (obj)
+                    {
+                        this->beginInsertRows(QModelIndex(), row, row);
+                        model.insert(row, obj);
+                        this->endInsertRows();
+                    }
+                }
+                row++;
+            }
+        }
+
+        // move objects if position changed
+        for (int i = 0; i<model.size(); )
+        {
+            auto const id = outKeyFunc(model[i]);
+            int pos = newItems.value(id, -1);
+            if (pos >= 0 && pos != i) {
+                this->beginMoveRows(QModelIndex(), i, i, QModelIndex(), pos + (pos > i ? 1 : 0));
+                model.move(i, pos);
+                this->endMoveRows();
+                continue;
+            }
+            i++;
+        }
+
+        // check if any of the existing objects which didn't change position needs updating
+        /*{
+            int row = 0;
+            for (auto const& in: input)
+            {
+                if (oldItems.contains(inKeyFunc(in)))
+                {
+                    if (!updateFunc(in, model[row]))
+                    {
+                        model[row] = createFunc(in);
+                        Q_EMIT this->dataChanged(this->index(row, 0), this->index(row, 0)); // or beginRemoveRows & beginInsertRows ?
+                    }
+                }
+                ++row;
+            }
+        }*/
+
+        // call updateFunc for all objects to synchornize changes to properties
+        {
+            int row = 0;
+            for (auto const& in: input)
+            {
+                if (!updateFunc(row, in, model[row]))
+                {
+                    model[row] = createFunc(in);
+                    Q_EMIT this->dataChanged(this->index(row, 0), this->index(row, 0)); // or beginRemoveRows & beginInsertRows ?
+                }
+                ++row;
+            }
+        }
+
+    }
+};
+
+#endif

=== added file 'src/Unity/optionselectorfilter.cpp'
--- src/Unity/optionselectorfilter.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/optionselectorfilter.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "optionselectorfilter.h"
+#include <QQmlEngine>
+#include <QDebug>
+
+namespace scopes_ng
+{
+
+OptionSelectorFilter::OptionSelectorFilter(unity::scopes::OptionSelectorFilter::SCPtr const& filter, unity::scopes::FilterState::SPtr const& filterState, unity::shell::scopes::FiltersInterface *parent)
+    : unity::shell::scopes::OptionSelectorFilterInterface(parent),
+    m_id(QString::fromStdString(filter->id())),
+    m_title(QString::fromStdString(filter->title())),
+    m_multiSelect(filter->multi_select()),
+    m_label(QString::fromStdString(filter->label())),
+    m_options(new OptionSelectorOptions(this, filter->options(), filter->active_options(*filterState))),
+    m_filterState(filterState),
+    m_filter(filter)
+{
+    QQmlEngine::setObjectOwnership(m_options.data(), QQmlEngine::CppOwnership);
+    connect(m_options.data(), SIGNAL(optionChecked(const QString&, bool)), this, SLOT(onOptionChecked(const QString&, bool)));
+}
+
+QString OptionSelectorFilter::filterId() const
+{
+    return m_id;
+}
+
+QString OptionSelectorFilter::title() const
+{
+    return m_title;
+}
+
+unity::shell::scopes::FiltersInterface::FilterType OptionSelectorFilter::filterType() const
+{
+    return unity::shell::scopes::FiltersInterface::FilterType::OptionSelectorFilter;
+}
+
+QString OptionSelectorFilter::label() const
+{
+    return m_label;
+}
+
+bool OptionSelectorFilter::multiSelect() const
+{
+    return m_multiSelect;
+}
+
+void OptionSelectorFilter::reset()
+{
+    if (auto state = m_filterState.lock())
+    {
+        state->remove(m_filter->id());
+        qDebug() << "Removing filter state for filter" << QString::fromStdString(m_filter->id());
+        m_options->update(m_filter->active_options(*state), true);
+        Q_EMIT filterStateChanged();
+    }
+}
+
+void OptionSelectorFilter::onOptionChecked(const QString& id, bool checked)
+{
+    if (auto state = m_filterState.lock())
+    {
+        auto const optid = id.toStdString();
+        for (auto const opt: m_filter->options())
+        {
+            if (opt->id() == optid)
+            {
+                m_filter->update_state(*state, opt, checked);
+                // onOptionChecked signal is triggered by the user, but we need to updated filter
+                // with new state since the state of other options may have changed if this is a single-selection filter.
+                // However, we pass allow_defaults = false, so that user is able to unselect all options and they are
+                // not forcefully reset to defaults if this happens.
+                m_options->update(m_filter->active_options(*state), false);
+                Q_EMIT filterStateChanged();
+                return;
+            }
+        }
+        qDebug() << "Removing filter state for filter" << QString::fromStdString(m_filter->id());
+        state->remove(m_filter->id());
+    }
+}
+
+unity::shell::scopes::OptionSelectorOptionsInterface* OptionSelectorFilter::options() const
+{
+    return m_options.data();
+}
+
+void OptionSelectorFilter::update(unity::scopes::FilterState::SPtr const& filterState)
+{
+    m_filterState = filterState;
+    m_options->update(m_filter->active_options(*filterState), true);
+}
+
+void OptionSelectorFilter::update(unity::scopes::FilterBase::SCPtr const& filter)
+{
+    unity::scopes::OptionSelectorFilter::SCPtr optselfilter = std::dynamic_pointer_cast<unity::scopes::OptionSelectorFilter const>(filter);
+    if (!optselfilter) {
+        qWarning() << "OptionSelectorFilter::update(): Unexpected filter" << QString::fromStdString(filter->id()) << "of type" << QString::fromStdString(filter->filter_type());
+        return;
+    }
+
+    m_filter = optselfilter;
+
+    if (optselfilter->multi_select() != m_multiSelect)
+    {
+        m_multiSelect = optselfilter->multi_select();
+        Q_EMIT multiSelectChanged(m_multiSelect);
+    }
+
+    if (optselfilter->title() != m_title.toStdString())
+    {
+        m_title = QString::fromStdString(optselfilter->title());
+        Q_EMIT titleChanged();
+    }
+
+    if (QString::fromStdString(optselfilter->label()) != m_label)
+    {
+        m_label = QString::fromStdString(optselfilter->label());
+        Q_EMIT labelChanged(m_label);
+    }
+
+    m_options->update(optselfilter->options());
+    if (auto state = m_filterState.lock()) {
+        m_options->update(m_filter->active_options(*state), false);
+    }
+}
+
+bool OptionSelectorFilter::isActive() const
+{
+    if (auto state = m_filterState.lock()) {
+        return m_filter->has_active_option(*state);
+    }
+    return false;
+}
+
+QString OptionSelectorFilter::filterTag() const
+{
+    if (m_multiSelect) {
+        // multi-selection filter cannot be used as primary navigation
+        return "";
+    }
+    if (auto state = m_filterState.lock()) {
+        auto selected = m_filter->active_options(*state);
+        if (selected.size() > 0) {
+            for (auto opt: m_filter->options()) {
+                if (selected.find(opt) != selected.end()) {
+                    return QString::fromStdString(opt->label()); // TODO: i18n
+                }
+            }
+        }
+    }
+    return "";
+}
+
+}

=== added file 'src/Unity/optionselectorfilter.h'
--- src/Unity/optionselectorfilter.h	1970-01-01 00:00:00 +0000
+++ src/Unity/optionselectorfilter.h	2016-03-16 11:17:35 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NG_OPTIONSELECTORFILTER_H
+#define NG_OPTIONSELECTORFILTER_H
+
+#include <unity/shell/scopes/OptionSelectorFilterInterface.h>
+#include <unity/shell/scopes/FiltersInterface.h>
+#include "filters.h"
+#include <unity/scopes/OptionSelectorFilter.h>
+#include "optionselectoroptions.h"
+#include <QScopedPointer>
+
+namespace scopes_ng
+{
+
+class Q_DECL_EXPORT OptionSelectorFilter : public unity::shell::scopes::OptionSelectorFilterInterface, public FilterUpdateInterface
+{
+    Q_OBJECT
+
+public:
+    OptionSelectorFilter(unity::scopes::OptionSelectorFilter::SCPtr const& filter, unity::scopes::FilterState::SPtr const& filterState, unity::shell::scopes::FiltersInterface *parent = nullptr);
+    QString filterId() const override;
+    QString title() const override;
+    unity::shell::scopes::FiltersInterface::FilterType filterType() const override;
+    QString label() const override;
+    bool multiSelect() const override;
+    unity::shell::scopes::OptionSelectorOptionsInterface* options() const override;
+    void update(unity::scopes::FilterBase::SCPtr const& filter) override;
+    void update(unity::scopes::FilterState::SPtr const& filterState) override;
+    bool isActive() const override;
+    QString filterTag() const override;
+    void reset() override;
+
+Q_SIGNALS:
+    void filterStateChanged();
+
+protected Q_SLOTS:
+    void onOptionChecked(const QString& id, bool checked);
+
+private:
+    QString m_id;
+    QString m_title;
+    bool m_multiSelect;
+    QString m_label;
+    QScopedPointer<OptionSelectorOptions> m_options;
+    std::weak_ptr<unity::scopes::FilterState> m_filterState;
+    unity::scopes::OptionSelectorFilter::SCPtr m_filter;
+};
+
+} // namespace scopes_ng
+
+#endif

=== added file 'src/Unity/optionselectoroptions.cpp'
--- src/Unity/optionselectoroptions.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/optionselectoroptions.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "optionselectoroptions.h"
+#include "optionselectorfilter.h"
+#include <QSet>
+#include <QDebug>
+
+namespace scopes_ng
+{
+
+struct OptionSelectorOption
+{
+    QString id;
+    QString label;
+    bool checked;
+    bool default_checked;
+
+    OptionSelectorOption(const QString& id, const QString &label, bool default_checked) :
+        id(id),
+        label(label),
+        checked(false),
+        default_checked(default_checked)
+    {}
+};
+
+OptionSelectorOptions::OptionSelectorOptions(OptionSelectorFilter *parent, std::list<unity::scopes::FilterOption::SCPtr> const& options,
+        std::set<unity::scopes::FilterOption::SCPtr> const& activeOptions)
+    : ModelUpdate(parent)
+{
+    bool const use_defaults = (activeOptions.size() == 0);
+
+    for (auto const& opt: options) {
+        auto shellOpt = QSharedPointer<OptionSelectorOption>(new OptionSelectorOption(QString::fromStdString(opt->id()), QString::fromStdString(opt->label()),
+                        opt->default_value()));
+        m_options.append(shellOpt);
+        if (use_defaults) {
+            shellOpt->checked = shellOpt->default_checked;
+        } else {
+            if (activeOptions.find(opt) != activeOptions.end()) {
+                shellOpt->checked = true;
+            }
+        }
+    }
+}
+
+void OptionSelectorOptions::update(const std::set<unity::scopes::FilterOption::SCPtr>& activeOptions, bool allow_defaults)
+{
+    bool const use_defaults = (allow_defaults && activeOptions.size() == 0);
+    if (use_defaults) {
+        for (int row = 0; row<m_options.size(); row++) {
+            auto &opt = m_options[row];
+            if (opt->checked != opt->default_checked) {
+                opt->checked = opt->default_checked;
+                Q_EMIT dataChanged(index(row, 0), index(row, 0), { unity::shell::scopes::OptionSelectorOptionsInterface::Roles::RoleOptionChecked });
+            }
+        }
+        return;
+    }
+
+    QSet<QString> actOpts;
+    for (auto const& opt: activeOptions) {
+        actOpts.insert(QString::fromStdString(opt->id()));
+    }
+
+    for (int row = 0; row<m_options.size(); row++) {
+        auto &opt = m_options[row];
+        if (actOpts.find(opt->id) != actOpts.end()) {
+            if (!opt->checked) {
+                opt->checked = true;
+                Q_EMIT dataChanged(index(row, 0), index(row, 0), { unity::shell::scopes::OptionSelectorOptionsInterface::Roles::RoleOptionChecked });
+            }
+        } else {
+            if (opt->checked) {
+                opt->checked = false;
+                Q_EMIT dataChanged(index(row, 0), index(row, 0), { unity::shell::scopes::OptionSelectorOptionsInterface::Roles::RoleOptionChecked });
+            }
+        }
+    }
+}
+
+void OptionSelectorOptions::update(const std::list<unity::scopes::FilterOption::SCPtr>& options)
+{
+    QVector<int> roles;
+    roles.append(unity::shell::scopes::OptionSelectorOptionsInterface::Roles::RoleOptionLabel);
+
+    syncModel(options, m_options,
+            // key function for scopes api filter option
+            [](const unity::scopes::FilterOption::SCPtr& opt) -> QString { return QString::fromStdString(opt->id()); },
+            // key function for shell api filter option
+            [](const QSharedPointer<OptionSelectorOption>& opt) -> QString { return opt->id; },
+            // factory function for creating shell filter option from scopes api filter option
+            [this](const unity::scopes::FilterOption::SCPtr& opt) -> QSharedPointer<OptionSelectorOption> {
+                auto optObj = QSharedPointer<OptionSelectorOption>(
+                    new OptionSelectorOption(QString::fromStdString(opt->id()), QString::fromStdString(opt->label()), opt->default_value()));
+                return optObj;
+            },
+            // filter option update function
+            [&roles, this](int row, const unity::scopes::FilterOption::SCPtr& op1, const QSharedPointer<OptionSelectorOption>& op2) -> bool {
+                if (op2->id != QString::fromStdString(op1->id())) {
+                    return false;
+                }
+                if (op2->label != QString::fromStdString(op1->label())) {
+                    op2->label = QString::fromStdString(op1->label());
+                    Q_EMIT dataChanged(index(row, 0), index(row, 0), roles);
+                }
+                return true;
+            });
+}
+
+int OptionSelectorOptions::rowCount(const QModelIndex& /* parent */) const
+{
+    return m_options.count();
+}
+
+void OptionSelectorOptions::setChecked(int row, bool checked)
+{
+    if (row >= 0 && row < m_options.count())
+    {
+        auto opt = m_options.at(row);
+        if (checked != opt->checked)
+        {
+            Q_EMIT optionChecked(opt->id, checked);
+        }
+    }
+}
+
+QVariant OptionSelectorOptions::data(const QModelIndex& index, int role) const
+{
+    if (index.row() >= m_options.count())
+    {
+        return QVariant();
+    }
+    switch (role)
+    {
+        case Qt::DisplayRole:
+        case RoleOptionId:
+            return QVariant(m_options.at(index.row())->id);
+        case RoleOptionLabel:
+            return QVariant(m_options.at(index.row())->label);
+        case RoleOptionChecked:
+            return QVariant(m_options.at(index.row())->checked);
+        default:
+            return QVariant();
+    }
+}
+
+}

=== added file 'src/Unity/optionselectoroptions.h'
--- src/Unity/optionselectoroptions.h	1970-01-01 00:00:00 +0000
+++ src/Unity/optionselectoroptions.h	2016-03-16 11:17:35 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NG_OPTIONSELECTOROPTIONS_H
+#define NG_OPTIONSELECTOROPTIONS_H
+
+#include <unity/shell/scopes/OptionSelectorOptionsInterface.h>
+#include <unity/scopes/FilterOption.h>
+#include "modelupdate.h"
+#include <QSharedPointer>
+#include <QList>
+#include <list>
+#include <set>
+#include <functional>
+
+namespace scopes_ng
+{
+
+class OptionSelectorFilter;
+class OptionSelectorOption;
+
+class Q_DECL_EXPORT OptionSelectorOptions :
+    public ModelUpdate<unity::shell::scopes::OptionSelectorOptionsInterface,
+                       std::list<unity::scopes::FilterOption::SCPtr>,
+                       QList<QSharedPointer<OptionSelectorOption>>>
+{
+    Q_OBJECT
+
+public:
+    OptionSelectorOptions(OptionSelectorFilter *parent,
+            std::list<unity::scopes::FilterOption::SCPtr> const& options,
+            std::set<unity::scopes::FilterOption::SCPtr> const& activeOptions);
+    void update(const std::list<unity::scopes::FilterOption::SCPtr>& options);
+    void update(const std::set<unity::scopes::FilterOption::SCPtr>& activeOptions, bool allow_defaults);
+    int rowCount(const QModelIndex& parent) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    Q_INVOKABLE void setChecked(int row, bool checked) override;
+
+Q_SIGNALS:
+    void optionChecked(const QString&, bool);
+
+private:
+    QList<QSharedPointer<OptionSelectorOption>> m_options;
+};
+
+} // namespace scopes_ng
+
+#endif

=== modified file 'src/Unity/plugin.cpp'
--- src/Unity/plugin.cpp	2016-02-11 15:35:47 +0000
+++ src/Unity/plugin.cpp	2016-03-16 11:17:35 +0000
@@ -32,6 +32,12 @@
 #include "previewmodel.h"
 #include "previewwidgetmodel.h"
 #include "settingsmodel.h"
+#include <unity/shell/scopes/FiltersInterface.h>
+#include <unity/shell/scopes/OptionSelectorFilterInterface.h>
+#include <unity/shell/scopes/OptionSelectorOptionsInterface.h>
+#include <unity/shell/scopes/RangeInputFilterInterface.h>
+#include <unity/shell/scopes/ValueSliderFilterInterface.h>
+#include <unity/shell/scopes/ValueSliderValuesInterface.h>
 #include "localization.h"
 
 void UnityPlugin::registerTypes(const char *uri)
@@ -49,6 +55,12 @@
     qmlRegisterUncreatableType<scopes_ng::ResultsModel>(uri, 0, 2, "ResultsModel", QStringLiteral("Can't create new ResultsModel in QML. Get them from Categories instance."));
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", QStringLiteral("Can't create new PreviewModel in QML. Get them from Scope instance."));
     qmlRegisterUncreatableType<scopes_ng::PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", QStringLiteral("Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance."));
+    qmlRegisterUncreatableType<unity::shell::scopes::FiltersInterface>(uri, 0, 2, "Filters", "Can't create Filters object in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::FilterBaseInterface>(uri, 0, 2, "Filter", "Can't create Filter object in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::OptionSelectorOptionsInterface>(uri, 0, 2, "OptionSelectorOptions", "Can't create Filters object in QML. Get them from OptionSelector instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::RangeInputFilterInterface>(uri, 0, 2, "RangeInputFilter", "Can't create new RangeInputFilter in QML. Get them from Filters instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::ValueSliderFilterInterface>(uri, 0, 2, "ValueSliderFilter", "Can't create new ValueSliderFilter in QML. Get them from Filters instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::ValueSliderValuesInterface>(uri, 0, 2, "ValueSliderValues", "Can't create new ValueSliderValues in QML. Get them from ValueSlideriFilter instance.");
 }
 
 void UnityPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== added file 'src/Unity/rangeinputfilter.cpp'
--- src/Unity/rangeinputfilter.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/rangeinputfilter.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,298 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rangeinputfilter.h"
+#include "utils.h"
+#include <cmath>
+#include <functional>
+#include <QDebug>
+
+using namespace unity::scopes;
+
+namespace scopes_ng
+{
+
+RangeInputFilter::RangeInputFilter(unity::scopes::RangeInputFilter::SCPtr const& filter, unity::scopes::FilterState::SPtr const& filterState, unity::shell::scopes::FiltersInterface *parent)
+    : unity::shell::scopes::RangeInputFilterInterface(parent),
+    m_id(QString::fromStdString(filter->id())),
+    m_title(QString::fromStdString(filter->title())),
+    m_startPrefixLabel(QString::fromStdString(filter->start_prefix_label())),
+    m_startPostfixLabel(QString::fromStdString(filter->start_postfix_label())),
+    m_centralLabel(QString::fromStdString(filter->central_label())),
+    m_endPrefixLabel(QString::fromStdString(filter->end_prefix_label())),
+    m_endPostfixLabel(QString::fromStdString(filter->end_postfix_label())),
+    m_defaultStart(filter->default_start_value()),
+    m_defaultEnd(filter->default_end_value()),
+    m_filterState(filterState),
+    m_filter(filter)
+{
+    const bool use_defaults = !filterState->has_filter(m_filter->id());
+    const unity::scopes::Variant start = m_filter->has_start_value(*filterState) ? Variant(m_filter->start_value(*filterState)) : (use_defaults ?
+        m_filter->default_start_value() : Variant::null());
+    m_start = start;
+    const unity::scopes::Variant end = m_filter->has_end_value(*filterState) ? Variant(m_filter->end_value(*filterState)) : (use_defaults ?
+            m_filter->default_end_value() : Variant::null());
+    m_end = end;
+}
+
+QString RangeInputFilter::filterId() const
+{
+    return m_id;
+}
+
+QString RangeInputFilter::title() const
+{
+    return m_title;
+}
+
+unity::shell::scopes::FiltersInterface::FilterType RangeInputFilter::filterType() const
+{
+    return unity::shell::scopes::FiltersInterface::FilterType::RangeInputFilter;
+}
+
+double RangeInputFilter::startValue() const
+{
+    if (m_start.which() == Variant::Double) {
+        return m_start.get_double();
+    }
+    qWarning() << "Requested startValue for filter" << m_id << ", but value is not set";
+    return 0.0f;
+}
+
+double RangeInputFilter::endValue() const
+{
+    if (m_end.which() == Variant::Double) {
+        return m_end.get_double();
+    }
+    qWarning() << "Requested endValue for filter" << m_id << ", but value is not set";
+    return 0.0f;
+}
+
+void RangeInputFilter::setStartValue(double value)
+{
+    const unity::scopes::Variant newValue(value);
+    setStartValue(newValue);
+}
+
+void RangeInputFilter::setEndValue(double value)
+{
+    const unity::scopes::Variant newValue(value);
+    setEndValue(newValue);
+}
+
+void RangeInputFilter::labelChange(std::string const& srcLabel, QString& destLabel, std::function<void()> const& emitLabelChangeSignal)
+{
+    auto const srclbl = QString::fromStdString(srcLabel);
+    if (srclbl != destLabel) {
+        destLabel = srclbl;
+        emitLabelChangeSignal();
+    }
+}
+
+void RangeInputFilter::update(unity::scopes::FilterState::SPtr const& filterState)
+{
+    m_filterState = filterState;
+
+    const bool use_defaults = !filterState->has_filter(m_filter->id());
+    const unity::scopes::Variant start = m_filter->has_start_value(*filterState) ? Variant(m_filter->start_value(*filterState)) : (use_defaults ?
+        m_filter->default_start_value() : Variant::null());
+    if (!compare(start, m_start)) {
+        m_start = start;
+        if (m_start.is_null()) {
+            Q_EMIT hasStartValueChanged();
+        }
+        Q_EMIT startValueChanged();
+    }
+
+    const unity::scopes::Variant end = m_filter->has_end_value(*filterState) ? Variant(m_filter->end_value(*filterState)) : (use_defaults ?
+            m_filter->default_end_value() : Variant::null());
+    if (!compare(end, m_end)) {
+        m_end = end;
+        if (m_end.is_null()) {
+            Q_EMIT hasEndValueChanged();
+        }
+        Q_EMIT endValueChanged();
+    }
+}
+
+void RangeInputFilter::update(unity::scopes::FilterBase::SCPtr const& filter)
+{
+    unity::scopes::RangeInputFilter::SCPtr rangefilter = std::dynamic_pointer_cast<unity::scopes::RangeInputFilter const>(filter);
+    if (!rangefilter) {
+        qWarning() << "RangeInputFilter::update(): Unexpected filter" << QString::fromStdString(filter->id()) << "of type" << QString::fromStdString(filter->filter_type());
+        return;
+    }
+
+    m_filter = rangefilter;
+
+    if (rangefilter->title() != m_title.toStdString())
+    {
+        m_title = QString::fromStdString(rangefilter->title());
+        Q_EMIT titleChanged();
+    }
+
+    labelChange(m_filter->start_prefix_label(), m_startPrefixLabel, [this]() { Q_EMIT startPrefixLabelChanged(); });
+    labelChange(m_filter->start_postfix_label(), m_startPostfixLabel, [this]() { Q_EMIT startPostfixLabelChanged(); });
+    labelChange(m_filter->central_label(), m_centralLabel, [this]() { Q_EMIT centralLabelChanged(); });
+    labelChange(m_filter->end_prefix_label(), m_endPrefixLabel, [this]() { Q_EMIT endPrefixLabelChanged(); });
+    labelChange(m_filter->end_postfix_label(), m_endPostfixLabel, [this]() { Q_EMIT endPostfixLabelChanged(); });
+}
+
+bool RangeInputFilter::isActive() const
+{
+    if (auto state = m_filterState.lock()) {
+        // check if current value from filter state is equal to default value
+        if (m_filter->has_start_value(*state) && !compare(m_filter->start_value(*state), m_filter->default_start_value())) {
+            return true;
+        }
+        if (m_filter->has_end_value(*state) && !compare(m_filter->end_value(*state), m_filter->default_end_value())) {
+            return true;
+        }
+    }
+    return false;
+}
+
+QString RangeInputFilter::filterTag() const
+{
+    return ""; // range input filter can't be a primary navigation filter
+}
+
+QString RangeInputFilter::startPrefixLabel() const
+{
+    return m_startPrefixLabel;
+}
+
+QString RangeInputFilter::startPostfixLabel() const
+{
+    return m_startPostfixLabel;
+}
+
+QString RangeInputFilter::centralLabel() const
+{
+    return m_centralLabel;
+}
+
+QString RangeInputFilter::endPrefixLabel() const
+{
+    return m_endPrefixLabel;
+}
+
+QString RangeInputFilter::endPostfixLabel() const
+{
+    return m_endPostfixLabel;
+}
+
+bool RangeInputFilter::hasStartValue() const
+{
+    return m_start.which() == Variant::Double;
+}
+
+bool RangeInputFilter::hasEndValue() const
+{
+    return m_end.which() == Variant::Double;
+}
+
+void RangeInputFilter::eraseStartValue()
+{
+    setStartValue(Variant::null());
+}
+
+void RangeInputFilter::eraseEndValue()
+{
+    setEndValue(Variant::null());
+}
+
+void RangeInputFilter::setStartValue(Variant const& value)
+{
+    if (auto state = m_filterState.lock()) {
+        try {
+            if (!compare(value, m_start)) {
+                qDebug() << "Changing startValue of filter" << m_id;
+                m_start = value;
+
+                m_filter->update_state(*state, m_start, m_end);
+
+                if (value.is_null()) {
+                    Q_EMIT hasStartValueChanged();
+                }
+                Q_EMIT startValueChanged();
+                Q_EMIT filterStateChanged();
+            }
+        }
+        catch (std::exception const& err)
+        {
+            // this is ok, it's user input and we may get partial input
+            qWarning() << "Could not set start value of filter" << m_id << ":" << QString::fromStdString(err.what());
+        }
+    }
+}
+
+void RangeInputFilter::setEndValue(Variant const& value)
+{
+    if (auto state = m_filterState.lock()) {
+        try {
+            if (!compare(value, m_end)) {
+                qDebug() << "Changing endValue of filter" << m_id;
+                m_end = value;
+
+                m_filter->update_state(*state, m_start, m_end);
+
+                if (value.is_null()) {
+                    Q_EMIT hasEndValueChanged();
+                }
+                Q_EMIT endValueChanged();
+                Q_EMIT filterStateChanged();
+            }
+        }
+        catch (std::exception const& err)
+        {
+            // this is ok, it's user input and we may get partial input
+            qWarning() << "Could not set start value of filter" << m_id << ":" << QString::fromStdString(err.what());
+        }
+    }
+}
+
+bool RangeInputFilter::compare(Variant const& v1, Variant const& v2)
+{
+    if (v1 == v2) {
+        return true;
+    }
+    if (v1.which() == Variant::Double && v2.which() == Variant::Double) {
+        return std::abs(v1.get_double() - v2.get_double()) < 0.0000001f;
+    }
+    return false;
+}
+
+bool RangeInputFilter::compare(double v1, Variant const& v2)
+{
+    if (v2.which() == Variant::Double) {
+        return std::abs(v1 - v2.get_double()) < 0.0000001f;
+    }
+    return false;
+}
+
+void RangeInputFilter::reset()
+{
+    // Filters::onFilterStateChanged will delay actual refresh,
+    // so it's ok to make two independent updates and emit two signals
+    setStartValue(m_filter->default_start_value());
+    setEndValue(m_filter->default_end_value());
+}
+
+}

=== added file 'src/Unity/rangeinputfilter.h'
--- src/Unity/rangeinputfilter.h	1970-01-01 00:00:00 +0000
+++ src/Unity/rangeinputfilter.h	2016-03-16 11:17:35 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NG_RANGEINPUTFILTER_H
+#define NG_RANGEINPUTFILTER_H
+
+#include <unity/shell/scopes/RangeInputFilterInterface.h>
+#include <unity/shell/scopes/FiltersInterface.h>
+#include "filters.h"
+#include <unity/scopes/RangeInputFilter.h>
+#include <QScopedPointer>
+
+namespace scopes_ng
+{
+
+class Q_DECL_EXPORT RangeInputFilter : public unity::shell::scopes::RangeInputFilterInterface, public FilterUpdateInterface
+{
+    Q_OBJECT
+
+public:
+    RangeInputFilter(unity::scopes::RangeInputFilter::SCPtr const& filter, unity::scopes::FilterState::SPtr const& filterState, unity::shell::scopes::FiltersInterface *parent = nullptr);
+    QString filterId() const override;
+    QString title() const override;
+    unity::shell::scopes::FiltersInterface::FilterType filterType() const override;
+    double startValue() const override;
+    double endValue() const override;
+
+    QString startPrefixLabel() const override;
+    QString startPostfixLabel() const override;
+    QString centralLabel() const override;
+    QString endPrefixLabel() const override;
+    QString endPostfixLabel() const override;
+
+    void setStartValue(double value) override;
+    void setEndValue(double value) override;
+
+    bool hasStartValue() const override;
+    bool hasEndValue() const override;
+
+    Q_INVOKABLE void eraseStartValue() override;
+    Q_INVOKABLE void eraseEndValue() override;
+
+    void update(unity::scopes::FilterBase::SCPtr const& filter) override;
+    void update(unity::scopes::FilterState::SPtr const& filterState) override;
+    bool isActive() const override;
+    QString filterTag() const override;
+    void reset() override;
+
+Q_SIGNALS:
+    void filterStateChanged();
+
+private:
+    void setStartValue(unity::scopes::Variant const& value);
+    void setEndValue(unity::scopes::Variant const& value);
+    static void labelChange(std::string const& srcLabel, QString& destLabel, std::function<void()> const& emitLabelChangeSignal);
+
+    QString m_id;
+    QString m_title;
+    QString m_startPrefixLabel;
+    QString m_startPostfixLabel;
+    QString m_centralLabel;
+    QString m_endPrefixLabel;
+    QString m_endPostfixLabel;
+    unity::scopes::Variant m_defaultStart;
+    unity::scopes::Variant m_defaultEnd;
+    unity::scopes::Variant m_start;
+    unity::scopes::Variant m_end;
+    std::weak_ptr<unity::scopes::FilterState> m_filterState;
+    unity::scopes::RangeInputFilter::SCPtr m_filter;
+
+    static bool compare(double v1, unity::scopes::Variant const& v2);
+    static bool compare(unity::scopes::Variant const& v1, unity::scopes::Variant const& v2);
+};
+
+} // namespace scopes_ng
+
+#endif

=== modified file 'src/Unity/resultsmodel.cpp'
--- src/Unity/resultsmodel.cpp	2016-02-15 17:43:12 +0000
+++ src/Unity/resultsmodel.cpp	2016-03-16 11:17:35 +0000
@@ -325,6 +325,8 @@
             return QVariant();
         case RoleQuickPreviewData:
             return componentValue(result, "quick-preview-data");
+        case RoleSocialActions:
+            return componentValue(result, "social-actions");
         default:
             return QVariant();
     }

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2016-02-26 12:38:28 +0000
+++ src/Unity/scope.cpp	2016-03-16 11:17:35 +0000
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2015 Canonical, Ltd.
  *
  * Authors:
  *  Michal Hruby <[e-mail]>
+ *  Pawel Stolowski <[e-mail]>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,13 +82,13 @@
 Scope::Scope(scopes_ng::Scopes* parent) :
       m_query_id(0)
     , m_formFactor(QStringLiteral("phone"))
+    , m_activeFiltersCount(0)
     , m_isActive(false)
     , m_searchInProgress(false)
     , m_activationInProgress(false)
     , m_resultsDirty(false)
     , m_delayedSearchProcessing(false)
     , m_hasNavigation(false)
-    , m_hasAltNavigation(false)
     , m_favorite(false)
     , m_initialQueryDone(false)
     , m_searchController(new CollectionController)
@@ -96,6 +97,12 @@
 {
     QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
     m_categories.reset(new Categories(this));
+    m_filters.reset(new Filters(m_filterState, this));
+
+    connect(m_filters.data(), SIGNAL(primaryFilterChanged()), this, SIGNAL(primaryNavigationFilterChanged()));
+
+    QQmlEngine::setObjectOwnership(m_filters.data(), QQmlEngine::CppOwnership);
+    connect(m_filters.data(), SIGNAL(filterStateChanged()), this, SLOT(filterStateChanged()));
 
     setScopesInstance(parent);
 
@@ -125,17 +132,15 @@
     CollectorBase::Status status;
     QList<std::shared_ptr<scopes::CategorisedResult>> results;
     scopes::Department::SCPtr rootDepartment;
-    scopes::OptionSelectorFilter::SCPtr sortOrderFilter;
-    scopes::FilterState filterState;
+    QList<scopes::FilterBase::SCPtr> filters;
 
-    status = pushEvent->collectSearchResults(results, rootDepartment, sortOrderFilter, filterState);
+    status = pushEvent->collectSearchResults(results, rootDepartment, filters);
     if (status == CollectorBase::Status::CANCELLED) {
         return;
     }
 
     m_rootDepartment = rootDepartment;
-    m_sortOrderFilter = sortOrderFilter;
-    m_receivedFilterState = filterState;
+    m_receivedFilters = filters;
 
     if (m_cachedResults.empty()) {
         m_cachedResults.swap(results);
@@ -404,17 +409,14 @@
     }
 
     m_lastRootDepartment = m_rootDepartment;
+    bool containsDepartments = (m_rootDepartment.get() != nullptr);
 
     //
     // only consider resetting current department id if we are in final flushUpdates
     // or received departments already. We don't know if we should reset it
     // until query finishes because departments may still arrive.
-    if (finalize || m_rootDepartment.get() != nullptr)
+    if (finalize || containsDepartments)
     {
-        bool containsDepartments = m_rootDepartment.get() != nullptr;
-        // design decision - no navigation when doing searches
-        containsDepartments &= m_searchQuery.isEmpty();
-
         if (containsDepartments != m_hasNavigation) {
             m_hasNavigation = containsDepartments;
             Q_EMIT hasNavigationChanged();
@@ -425,54 +427,30 @@
             m_currentNavigationId = QLatin1String("");
             Q_EMIT currentNavigationIdChanged();
         }
-    }
-
-    // process the alt navigation (sort order filter)
-    QString currentAltNav(m_currentAltNavigationId);
-
-    if (m_sortOrderFilter && m_sortOrderFilter != m_lastSortOrderFilter) {
-        // build the nodes
-        m_altNavTree.reset(new DepartmentNode);
-        m_altNavTree->initializeForFilter(m_sortOrderFilter);
-
-        if (m_sortOrderFilter->has_active_option(m_receivedFilterState)) {
-            auto active_options = m_sortOrderFilter->active_options(m_receivedFilterState);
-            scopes::FilterOption::SCPtr active_option = *active_options.begin();
-            if (active_option) {
-                currentAltNav = QString::fromStdString(active_option->id());
-            }
-        }
-    }
-
-    m_lastSortOrderFilter = m_sortOrderFilter;
-
-    //
-    // only consider resetting alt nav id if we are in final flushUpdates
-    // or received alt nav filter already. We don't know if we should reset it
-    // until query finishes because filter may still arrive.
-    if (finalize || m_sortOrderFilter.get() != nullptr)
+        processPrimaryNavigationTag(m_currentNavigationId);
+    }
+
+    // process filters
+    if (finalize || m_receivedFilters.size() > 0)
     {
-        bool containsAltNav = m_sortOrderFilter.get() != nullptr;
-        // design decision - no navigation when doing searches
-        containsAltNav &= m_searchQuery.isEmpty();
-
-        if (containsAltNav != m_hasAltNavigation) {
-            m_hasAltNavigation = containsAltNav;
-            Q_EMIT hasAltNavigationChanged();
-        }
-
-        if (!containsAltNav && !m_currentAltNavigationId.isEmpty()) {
-            qDebug() << "Resetting alt nav id";
-            m_currentAltNavigationId = QLatin1String("");
-            Q_EMIT currentAltNavigationIdChanged();
-        }
-
-        if (containsAltNav && currentAltNav != m_currentAltNavigationId) {
-            m_currentAltNavigationId = currentAltNav;
-            Q_EMIT currentAltNavigationIdChanged();
-
-            // update the alt navigation models
-            updateNavigationModels(m_altNavTree.data(), m_altNavModels, m_currentAltNavigationId);
+        qDebug() << "Processing" << m_receivedFilters.size() << "filters";
+        const bool containsFilters = (m_receivedFilters.size() > 0);
+        const bool haveFiltersAlready = (m_filters->rowCount() > 0);
+        if (containsFilters) {
+            m_filters->update(m_receivedFilters, containsDepartments);
+            processPrimaryNavigationTag(m_currentNavigationId);
+            if (!haveFiltersAlready) {
+                Q_EMIT filtersChanged();
+            }
+            qDebug() << "Current number of filters:" << m_filters->rowCount();
+        }
+        else
+        {
+            qDebug() << "Removing all filters";
+            m_filters->clear();
+            if (haveFiltersAlready) {
+                Q_EMIT filtersChanged();
+            }
         }
     }
 }
@@ -698,6 +676,7 @@
 {
     if (m_currentNavigationId != id) {
         qDebug() << "Setting current nav id:" <<  this->id() << id;
+        processPrimaryNavigationTag(id);
         m_currentNavigationId = id;
         Q_EMIT currentNavigationIdChanged();
     }
@@ -935,13 +914,6 @@
     }
 }
 
-/*
-Filters* Scope::filters() const
-{
-    return m_filters.get();
-}
-*/
-
 unity::shell::scopes::NavigationInterface* Scope::getNavigation(QString const& navId)
 {
     if (!m_departmentTree) return nullptr;
@@ -962,54 +934,19 @@
     return navModel;
 }
 
-unity::shell::scopes::NavigationInterface* Scope::getAltNavigation(QString const& navId)
-{
-    if (!m_altNavTree) return nullptr;
-
-    DepartmentNode* node = m_altNavTree->findNodeById(navId);
-    if (!node) return nullptr;
-
-    Department* navModel = new Department;
-    navModel->setScopeId(this->id());
-    navModel->loadFromDepartmentNode(node);
-    navModel->markSubdepartmentActive(m_currentAltNavigationId);
-
-    // sharing m_inverseDepartments with getNavigation
-    m_altNavModels.insert(navId, navModel);
-    m_inverseDepartments.insert(navModel, navId);
-    QObject::connect(navModel, &QObject::destroyed, this, &Scope::departmentModelDestroyed);
-
-    return navModel;
-}
-
-QString Scope::buildQuery(QString const& scopeId, QString const& searchQuery, QString const& departmentId, QString const& primaryFilterId, QString const& primaryOptionId)
+QString Scope::buildQuery(QString const& scopeId, QString const& searchQuery, QString const& departmentId, unity::scopes::FilterState const& filterState)
 {
     scopes::CannedQuery q(scopeId.toStdString());
     q.set_query_string(searchQuery.toStdString());
     q.set_department_id(departmentId.toStdString());
-
-    if (!primaryFilterId.isEmpty() && !primaryOptionId.isEmpty()) {
-        scopes::FilterState filter_state;
-        scopes::OptionSelectorFilter::update_state(filter_state, primaryFilterId.toStdString(), primaryOptionId.toStdString(), true);
-        q.set_filter_state(filter_state);
-    }
-
+    q.set_filter_state(filterState);
     return QString::fromStdString(q.to_uri());
 }
 
-void Scope::setNavigationState(QString const& navId, bool altNavigation)
+void Scope::setNavigationState(QString const& navId)
 {
-    QString primaryFilterId;
-    if (m_sortOrderFilter) {
-        primaryFilterId = QString::fromStdString(m_sortOrderFilter->id());
-    }
-    if (!altNavigation) {
-        // switch current department id
-        performQuery(buildQuery(id(), m_searchQuery, navId, primaryFilterId, m_currentAltNavigationId));
-    } else {
-        // switch current primary filter
-        performQuery(buildQuery(id(), m_searchQuery, m_currentNavigationId, primaryFilterId, navId));
-    }
+    // switch current department id
+    performQuery(buildQuery(id(), m_searchQuery, navId, m_filterState));
 }
 
 void Scope::departmentModelDestroyed(QObject* obj)
@@ -1020,7 +957,6 @@
     if (it == m_inverseDepartments.end()) return;
 
     m_departmentModels.remove(it.value(), navigation);
-    m_altNavModels.remove(it.value(), navigation);
     m_inverseDepartments.erase(it);
 }
 
@@ -1082,21 +1018,16 @@
     return m_hasNavigation;
 }
 
-QString Scope::currentAltNavigationId() const
-{
-    return m_currentAltNavigationId;
-}
-
-bool Scope::hasAltNavigation() const
-{
-    return m_hasAltNavigation;
-}
-
 QVariantMap Scope::customizations() const
 {
     return m_customizations;
 }
 
+int Scope::activeFiltersCount() const
+{
+    return m_activeFiltersCount;
+}
+
 void Scope::setSearchQuery(const QString& search_query)
 {
     // this method is called by the shell when user types in search string,
@@ -1133,11 +1064,6 @@
         }
         m_searchQuery = search_query;
 
-        // atm only empty query can have a filter state
-        if (!m_searchQuery.isEmpty()) {
-            m_filterState = scopes::FilterState();
-        }
-
         // only use typing delay if scope is active, otherwise apply immediately
         if (m_isActive) {
             m_typingTimer.start();
@@ -1348,6 +1274,19 @@
     }
 }
 
+void Scope::resetPrimaryNavigationTag()
+{
+    qDebug() << "resetPrimaryNavigationTag()";
+    setCurrentNavigationId("");
+    m_filters->update(unity::scopes::FilterState());
+    filterStateChanged();
+}
+
+void Scope::resetFilters()
+{
+    m_filters->reset();
+}
+
 void Scope::closeScope(unity::shell::scopes::ScopeInterface* scope)
 {
     if (m_scopesInstance) {
@@ -1392,4 +1331,82 @@
     return m_initialQueryDone;
 }
 
+unity::shell::scopes::FiltersInterface* Scope::filters() const
+{
+    if (m_filters && m_filters->rowCount() == 0) {
+        return nullptr;
+    }
+    return m_filters.data();
+}
+
+unity::shell::scopes::FilterBaseInterface* Scope::primaryNavigationFilter() const
+{
+    return m_filters->primaryFilter().data();
+}
+
+QString Scope::primaryNavigationTag() const
+{
+    return m_primaryNavigationTag;
+}
+
+void Scope::filterStateChanged()
+{
+    qDebug() << "Filters changed";
+    m_filterState = m_filters->filterState();
+    processPrimaryNavigationTag(m_currentNavigationId);
+    processActiveFiltersCount();
+    invalidateResults();
+}
+
+//
+// Iterate over all filters to calculate the number of active ones.
+void Scope::processActiveFiltersCount()
+{
+    const int count = m_filters->activeFiltersCount();
+    if (count != m_activeFiltersCount) {
+        m_activeFiltersCount = count;
+        Q_EMIT activeFiltersCountChanged();
+    }
+    qDebug() << "active filters count:" << m_activeFiltersCount;
+}
+
+//
+// Determine primary navigation tag (the "brick" in search bar) from
+// current department (if departments are present) or primary navigation
+// filter (if scopes doesn't have departments but has filters and one of
+// them has 'Primary' flag set.
+void Scope::processPrimaryNavigationTag(QString const &targetDepartmentId)
+{
+    QString tag;
+    // has departments?
+    if (m_rootDepartment) {
+        auto it = m_departmentModels.constFind(targetDepartmentId);
+        if (it != m_departmentModels.constEnd()) {
+            tag = (targetDepartmentId == "" ? "" : it.value()->label());
+        } else {
+            it = m_departmentModels.constFind(m_currentNavigationId);
+            if (it != m_departmentModels.constEnd()) {
+                auto subDept = (*it)->findSubdepartment(targetDepartmentId);
+                if (subDept) {
+                    tag = subDept->label;
+                } else {
+                    qWarning() << "Scope::processPrimaryNavigationTag(): no subdepartment '" << targetDepartmentId << "'";
+                }
+            } else {
+                qWarning() << "Scope::processPrimaryNavigationTag(): no department model for '" << m_currentNavigationId << "'";
+            }
+        }
+    } else {
+        auto pf = m_filters->primaryFilter();
+        if (pf) {
+            tag = pf->filterTag();
+        }
+    }
+    qDebug() << "Scope::processPrimaryNavigationTag(): tag is '" << tag << "'";
+    if (m_primaryNavigationTag != tag) {
+        m_primaryNavigationTag = tag;
+        Q_EMIT primaryNavigationTagChanged();
+    }
+}
+
 } // namespace scopes_ng

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2016-02-18 15:46:26 +0000
+++ src/Unity/scope.h	2016-03-16 11:17:35 +0000
@@ -38,6 +38,7 @@
 #include <unity/scopes/ScopeMetadata.h>
 #include <unity/shell/scopes/ScopeInterface.h>
 
+#include "filters.h"
 #include "collectors.h"
 #include "departmentnode.h"
 #include "department.h"
@@ -129,6 +130,11 @@
     unity::shell::scopes::ScopeInterface::Status status() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     unity::shell::scopes::SettingsModelInterface* settings() const override;
+    unity::shell::scopes::FiltersInterface* filters() const override;
+    unity::shell::scopes::FilterBaseInterface* primaryNavigationFilter() const override;
+    QString primaryNavigationTag() const override;
+    int activeFiltersCount() const override;
+
     bool require_child_scopes_refresh() const;
     void update_child_scopes();
     QString searchQuery() const override;
@@ -137,8 +143,6 @@
     bool isActive() const override;
     QString currentNavigationId() const override;
     bool hasNavigation() const override;
-    QString currentAltNavigationId() const override;
-    bool hasAltNavigation() const override;
     QVariantMap customizations() const override;
 
     /* setters */
@@ -153,10 +157,11 @@
     Q_INVOKABLE void cancelActivation() override;
     Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
     Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& id) override;
-    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getAltNavigation(QString const& id) override;
-    Q_INVOKABLE void setNavigationState(QString const& navId, bool altNavigation) override;
+    Q_INVOKABLE void setNavigationState(QString const& navId) override;
     Q_INVOKABLE void performQuery(QString const& cannedQuery) override;
     Q_INVOKABLE void refresh() override;
+    Q_INVOKABLE void resetPrimaryNavigationTag() override;
+    Q_INVOKABLE void resetFilters() override;
 
     void setScopeData(unity::scopes::ScopeMetadata const& data);
     void handleActivation(std::shared_ptr<unity::scopes::ActivationResponse> const&, unity::scopes::Result::SPtr const&, QString const& categoryId="");
@@ -191,6 +196,7 @@
     void flushUpdates(bool finalize = false);
     void metadataRefreshed();
     void departmentModelDestroyed(QObject* obj);
+    void filterStateChanged();
     void previewModelDestroyed(QObject *obj);
 
 protected:
@@ -206,12 +212,14 @@
 
 private:
     static void updateNavigationModels(DepartmentNode* rootNode, QMultiMap<QString, Department*>& navigationModels, QString const& activeNavigation);
-    static QString buildQuery(QString const& scopeId, QString const& searchQuery, QString const& departmentId, QString const& primaryFilterId, QString const& primaryOptionId);
+    static QString buildQuery(QString const& scopeId, QString const& searchQuery, QString const& departmentId, unity::scopes::FilterState const& filterState);
     void setScopesInstance(Scopes*);
     void startTtlTimer();
     void setCurrentNavigationId(QString const& id);
     void setFilterState(unity::scopes::FilterState const& filterState);
     void processSearchChunk(PushEvent* pushEvent);
+    void processPrimaryNavigationTag(QString const &targetDepartmentId);
+    void processActiveFiltersCount();
     void setCannedQuery(unity::scopes::CannedQuery const& query);
     void executeCannedQuery(unity::scopes::CannedQuery const& query, bool allowDelayedActivation);
     void handlePreviewUpdate(unity::scopes::Result::SPtr const& result, unity::scopes::PreviewWidgetList const& widgets);
@@ -227,16 +235,16 @@
     QString m_noResultsHint;
     QString m_formFactor;
     QString m_currentNavigationId;
-    QString m_currentAltNavigationId;
+    QString m_primaryNavigationTag;
     QVariantMap m_customizations;
     std::unique_ptr<unity::scopes::Variant> m_queryUserData;
+    int m_activeFiltersCount;
     bool m_isActive;
     bool m_searchInProgress;
     bool m_activationInProgress;
     bool m_resultsDirty;
     bool m_delayedSearchProcessing;
     bool m_hasNavigation;
-    bool m_hasAltNavigation;
     bool m_favorite;
     bool m_initialQueryDone;
 
@@ -248,20 +256,18 @@
     std::shared_ptr<unity::scopes::ActivationResponse> m_delayedActivation;
     unity::scopes::Department::SCPtr m_rootDepartment;
     unity::scopes::Department::SCPtr m_lastRootDepartment;
-    unity::scopes::OptionSelectorFilter::SCPtr m_sortOrderFilter;
-    unity::scopes::OptionSelectorFilter::SCPtr m_lastSortOrderFilter;
     unity::scopes::FilterState m_filterState;
-    unity::scopes::FilterState m_receivedFilterState;
     unity::shell::scopes::ScopeInterface::Status m_status;
+    QList<unity::scopes::FilterBase::SCPtr> m_receivedFilters;
+    QScopedPointer<Filters> m_filters;
+
     QScopedPointer<SettingsModel> m_settingsModel;
     QSharedPointer<DepartmentNode> m_departmentTree;
-    QSharedPointer<DepartmentNode> m_altNavTree;
     QTimer m_typingTimer;
     QTimer m_searchProcessingDelayTimer;
     QTimer m_invalidateTimer;
     QList<std::shared_ptr<unity::scopes::CategorisedResult>> m_cachedResults;
     QMultiMap<QString, Department*> m_departmentModels;
-    QMultiMap<QString, Department*> m_altNavModels;
     QMap<Department*, QString> m_inverseDepartments;
     QMetaObject::Connection m_metadataConnection;
     QSharedPointer<LocationService> m_locationService;

=== modified file 'src/Unity/utils.cpp'
--- src/Unity/utils.cpp	2015-09-08 12:32:05 +0000
+++ src/Unity/utils.cpp	2016-03-16 11:17:35 +0000
@@ -78,6 +78,8 @@
             return scopes::Variant(static_cast<int64_t>(variant.toUInt()));
         case QMetaType::Double:
             return scopes::Variant(variant.toDouble());
+        case QMetaType::Float:
+            return scopes::Variant(variant.toDouble());
         case QMetaType::QString:
             return scopes::Variant(variant.toString().toStdString());
         case QMetaType::QVariantMap: {

=== added file 'src/Unity/valuesliderfilter.cpp'
--- src/Unity/valuesliderfilter.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/valuesliderfilter.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "valuesliderfilter.h"
+#include "utils.h"
+#include <cmath>
+#include <functional>
+#include <QQmlEngine>
+#include <QDebug>
+
+using namespace unity::scopes;
+
+namespace scopes_ng
+{
+
+ValueSliderFilter::ValueSliderFilter(unity::scopes::ValueSliderFilter::SCPtr const& filter, unity::scopes::FilterState::SPtr const& filterState, unity::shell::scopes::FiltersInterface *parent)
+    : unity::shell::scopes::ValueSliderFilterInterface(parent),
+    m_id(QString::fromStdString(filter->id())),
+    m_title(QString::fromStdString(filter->title())),
+    m_min(filter->min()),
+    m_max(filter->max()),
+    m_values(new ValueSliderValues(this)),
+    m_filterState(filterState),
+    m_filter(filter)
+{
+    QQmlEngine::setObjectOwnership(m_values.data(), QQmlEngine::CppOwnership);
+    m_value = (filter->has_value(*filterState) ? filter->value(*filterState) : filter->default_value());
+}
+
+QString ValueSliderFilter::filterId() const
+{
+    return m_id;
+}
+
+QString ValueSliderFilter::title() const
+{
+    return m_title;
+}
+
+unity::shell::scopes::FiltersInterface::FilterType ValueSliderFilter::filterType() const
+{
+    return unity::shell::scopes::FiltersInterface::FilterType::ValueSliderFilter;
+}
+
+double ValueSliderFilter::value() const
+{
+    return m_value;
+}
+
+void ValueSliderFilter::setValue(double value)
+{
+    if (auto state = m_filterState.lock()) {
+        if (value != m_value) {
+            qDebug() << "Changing value of filter" << m_id;
+
+            m_filter->update_state(*state, m_value = value);
+
+            Q_EMIT valueChanged();
+            Q_EMIT filterStateChanged();
+        }
+    }
+}
+
+double ValueSliderFilter::minValue() const
+{
+    return m_min;
+}
+
+double ValueSliderFilter::maxValue() const
+{
+    return m_max;
+}
+
+unity::shell::scopes::ValueSliderValuesInterface* ValueSliderFilter::values() const
+{
+    return m_values.data();
+}
+
+void ValueSliderFilter::update(unity::scopes::FilterState::SPtr const& filterState)
+{
+    m_filterState = filterState;
+
+    const double value = (m_filter->has_value(*filterState) ? m_filter->value(*filterState) : m_filter->default_value());
+    if (value != m_value) {
+        m_value = value;
+        Q_EMIT valueChanged();
+    }
+
+    if (std::abs(m_filter->min() - m_min) < 0.0000001f) {
+        m_min = m_filter->min();
+        Q_EMIT minValueChanged();
+    }
+
+    if (std::abs(m_filter->max() - m_max) < 0.0000001f) {
+        m_max = m_filter->max();
+        Q_EMIT maxValueChanged();
+    }
+}
+
+void ValueSliderFilter::update(unity::scopes::FilterBase::SCPtr const& filter)
+{
+    unity::scopes::ValueSliderFilter::SCPtr valueslider = std::dynamic_pointer_cast<unity::scopes::ValueSliderFilter const>(filter);
+    if (!valueslider) {
+        qWarning() << "ValueSliderFilter::update(): Unexpected filter" << QString::fromStdString(filter->id()) << "of type" << QString::fromStdString(filter->filter_type());
+        return;
+    }
+
+    m_filter = valueslider;
+
+    if (valueslider->title() != m_title.toStdString())
+    {
+        m_title = QString::fromStdString(valueslider->title());
+        Q_EMIT titleChanged();
+    }
+
+    m_values->update(valueslider->labels(), valueslider->min(), valueslider->max());
+}
+
+bool ValueSliderFilter::isActive() const
+{
+    if (auto state = m_filterState.lock()) {
+        if (m_filter->has_value(*state) && m_filter->value(*state) != m_filter->default_value()) {
+            return true;
+        }
+    }
+    return false;
+}
+
+QString ValueSliderFilter::filterTag() const
+{
+    return ""; // slider filter can't be a primary navigation filter
+}
+
+void ValueSliderFilter::reset()
+{
+    setValue(m_filter->default_value());
+}
+
+}

=== added file 'src/Unity/valuesliderfilter.h'
--- src/Unity/valuesliderfilter.h	1970-01-01 00:00:00 +0000
+++ src/Unity/valuesliderfilter.h	2016-03-16 11:17:35 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NG_VALUESLIDERFILTER_H
+#define NG_VALUESLIDERFILTER_H
+
+#include <unity/shell/scopes/ValueSliderFilterInterface.h>
+#include <unity/shell/scopes/FiltersInterface.h>
+#include "filters.h"
+#include "valueslidervalues.h"
+#include <unity/scopes/ValueSliderFilter.h>
+
+namespace scopes_ng
+{
+
+class Q_DECL_EXPORT ValueSliderFilter : public unity::shell::scopes::ValueSliderFilterInterface, public FilterUpdateInterface
+{
+    Q_OBJECT
+
+public:
+    ValueSliderFilter(unity::scopes::ValueSliderFilter::SCPtr const& filter, unity::scopes::FilterState::SPtr const& filterState, unity::shell::scopes::FiltersInterface *parent = nullptr);
+    QString filterId() const override;
+    QString title() const override;
+    unity::shell::scopes::FiltersInterface::FilterType filterType() const override;
+    double value() const override;
+
+    void setValue(double value) override;
+    double minValue() const override;
+    double maxValue() const override;
+    unity::shell::scopes::ValueSliderValuesInterface* values() const override;
+
+    void update(unity::scopes::FilterBase::SCPtr const& filter) override;
+    void update(unity::scopes::FilterState::SPtr const& filterState) override;
+    bool isActive() const override;
+    QString filterTag() const override;
+    void reset() override;
+
+Q_SIGNALS:
+    void filterStateChanged();
+
+private:
+    QString m_id;
+    QString m_title;
+    double m_min;
+    double m_max;
+    double m_value;
+    QScopedPointer<ValueSliderValues> m_values;
+    std::weak_ptr<unity::scopes::FilterState> m_filterState;
+    unity::scopes::ValueSliderFilter::SCPtr m_filter;
+};
+
+} // namespace scopes_ng
+
+#endif

=== added file 'src/Unity/valueslidervalues.cpp'
--- src/Unity/valueslidervalues.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/valueslidervalues.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "valueslidervalues.h"
+#include "valuesliderfilter.h"
+#include <utility>
+
+namespace scopes_ng
+{
+
+ValueSliderValues::ValueSliderValues(ValueSliderFilter *parent)
+    : ModelUpdate(parent)
+{
+}
+
+void ValueSliderValues::update(const unity::scopes::ValueSliderLabels& values, int min, int max)
+{
+    unity::scopes::ValueLabelPairList labels;
+    labels.push_back(std::make_pair(min, values.min_label()));
+    for (auto const v: values.extra_labels())
+    {
+        labels.push_back(v);
+    }
+    labels.push_back(std::make_pair(max, values.max_label()));
+    syncModel(labels, m_values,
+            [](const unity::scopes::ValueLabelPair& p) -> int { return p.first; },
+            [](const QSharedPointer<QPair<int, QString>>& p) -> int { return p->first; },
+            [](const unity::scopes::ValueLabelPair& p) -> QSharedPointer<QPair<int, QString>> {
+                return QSharedPointer<QPair<int, QString>>(new QPair<int, QString>(p.first, QString::fromStdString(p.second)));
+                },
+            [this](int row, const unity::scopes::ValueLabelPair& v1, const QSharedPointer<QPair<int, QString>>& v2) -> bool {
+                if (v1.first != v2->first) {
+                    return false;
+                }
+
+                if (v1.second != v2->second.toStdString()) {
+                    Q_EMIT dataChanged(index(row, 0), index(row, 0), { unity::shell::scopes::ValueSliderValuesInterface::Roles::RoleLabel });
+                }
+                return true;
+            });
+}
+
+int ValueSliderValues::rowCount(const QModelIndex&) const
+{
+    return m_values.count();
+}
+
+QVariant ValueSliderValues::data(const QModelIndex& index, int role) const
+{
+    if (index.row() >= m_values.count())
+    {
+        return QVariant();
+    }
+    switch (role)
+    {
+        case Qt::DisplayRole:
+        case RoleValue:
+            return QVariant(m_values.at(index.row())->first);
+        case RoleLabel:
+            return QVariant(m_values.at(index.row())->second);
+        default:
+            return QVariant();
+    }
+}
+
+}

=== added file 'src/Unity/valueslidervalues.h'
--- src/Unity/valueslidervalues.h	1970-01-01 00:00:00 +0000
+++ src/Unity/valueslidervalues.h	2016-03-16 11:17:35 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NG_VALUESLIDERVALUES_H
+#define NG_VALUESLIDERVALUES_H
+
+#include <unity/shell/scopes/ValueSliderValuesInterface.h>
+#include "modelupdate.h"
+#include <QPair>
+#include <QSharedPointer>
+#include <QString>
+#include <unity/scopes/ValueSliderLabels.h>
+
+namespace scopes_ng
+{
+
+class ValueSliderFilter;
+
+class Q_DECL_EXPORT ValueSliderValues :
+    public ModelUpdate<unity::shell::scopes::ValueSliderValuesInterface,
+        unity::scopes::ValueLabelPairList,
+        QList<QSharedPointer<QPair<int, QString>>>,
+        int
+    >
+{
+    Q_OBJECT
+
+public:
+    explicit ValueSliderValues(ValueSliderFilter *parent = nullptr);
+    void update(const unity::scopes::ValueSliderLabels& values, int min, int max);
+    int rowCount(const QModelIndex& parent) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+private:
+    QList<QSharedPointer<QPair<int, QString>>> m_values;
+};
+
+}
+
+#endif

=== modified file 'src/python/CMakeLists.txt'
--- src/python/CMakeLists.txt	2015-03-03 10:52:45 +0000
+++ src/python/CMakeLists.txt	2016-03-16 11:17:35 +0000
@@ -1,3 +1,3 @@
 add_subdirectory(scope_harness)
-add_test(python_bindings ${CMAKE_CURRENT_BINARY_DIR}/python-test.py ${PROJECT_BINARY_DIR}/tests/data)
+#add_test(python_bindings ${CMAKE_CURRENT_BINARY_DIR}/python-test.py ${PROJECT_BINARY_DIR}/tests/data)
 configure_file(python-test.py ${CMAKE_CURRENT_BINARY_DIR}/python-test.py COPYONLY)

=== modified file 'src/scope-harness/test-utils.cpp'
--- src/scope-harness/test-utils.cpp	2016-02-17 15:49:37 +0000
+++ src/scope-harness/test-utils.cpp	2016-03-16 11:17:35 +0000
@@ -135,6 +135,13 @@
     QCOMPARE(scope->searchInProgress(), false);
 }
 
+void TestUtils::waitForFilterStateChange(QSharedPointer<ss::ScopeInterface> scope)
+{
+    QSignalSpy spy(scope->filters(), SIGNAL(filterStateChanged()));
+    QVERIFY(spy.wait());
+    QCOMPARE(spy.count(), 1);
+}
+
 void TestUtils::setFavouriteScopes(const QStringList& cannedQueries)
 {
     setenv("GSETTINGS_BACKEND", "memory", 1);

=== modified file 'src/scope-harness/test-utils.h'
--- src/scope-harness/test-utils.h	2016-02-17 15:49:37 +0000
+++ src/scope-harness/test-utils.h	2016-03-16 11:17:35 +0000
@@ -51,6 +51,9 @@
 static void performSearch(QSharedPointer<shell::scopes::ScopeInterface> scope, QString const& searchString);
 
 Q_DECL_EXPORT
+static void waitForFilterStateChange(QSharedPointer<shell::scopes::ScopeInterface> scope);
+
+Q_DECL_EXPORT
 static void waitForResultsChange(QSharedPointer<shell::scopes::ScopeInterface> scope);
 
 Q_DECL_EXPORT

=== modified file 'src/scope-harness/view/results-view.cpp'
--- src/scope-harness/view/results-view.cpp	2015-05-18 09:33:17 +0000
+++ src/scope-harness/view/results-view.cpp	2016-03-16 11:17:35 +0000
@@ -96,42 +96,28 @@
 
     results::Department browseDepartment(const string& id, bool altNavigation)
     {
+        if (altNavigation) {
+            throw std::domain_error("ResultsView::browseAltDepartment(): altNavigation is deprecated");
+        }
+
         checkActiveScope();
 
         QSharedPointer<ss::NavigationInterface> navigationModel;
-        if (altNavigation)
-        {
-            navigationModel.reset(m_active_scope->getAltNavigation(QString::fromStdString(id)));
-        }
-        else
-        {
-            navigationModel.reset(m_active_scope->getNavigation(QString::fromStdString(id)));
-        }
+        navigationModel.reset(m_active_scope->getNavigation(QString::fromStdString(id)));
         TestUtils::throwIfNot(bool(navigationModel), "Unknown department: '" + id + "'");
 
         QSignalSpy spy(navigationModel.data(), SIGNAL(loadedChanged()));
 
         bool shouldUpdate = false;
 
-        if (altNavigation)
-        {
-            if (m_active_scope->currentAltNavigationId().toStdString() != id)
-            {
-                shouldUpdate = true;
-            }
-        }
-        else
-        {
-            if (m_active_scope->currentNavigationId().toStdString() != id)
-            {
-                shouldUpdate = true;
-            }
+        if (m_active_scope->currentNavigationId().toStdString() != id)
+        {
+            shouldUpdate = true;
         }
 
         if (shouldUpdate)
         {
-            m_active_scope->setNavigationState(QString::fromStdString(id),
-                                               altNavigation);
+            m_active_scope->setNavigationState(QString::fromStdString(id));
             TestUtils::waitForSearchFinish(m_active_scope);
         }
 
@@ -288,9 +274,7 @@
 
 bool ResultsView::hasAltDepartments() const
 {
-    p->checkActiveScope();
-
-    return p->m_active_scope->hasAltNavigation();
+    throw std::domain_error("ResultsView::hasAltDepartments() is deprecated");
 }
 
 string ResultsView::departmentId() const
@@ -302,9 +286,7 @@
 
 string ResultsView::altDepartmentId() const
 {
-    p->checkActiveScope();
-
-    return p->m_active_scope->currentAltNavigationId().toStdString();
+    throw std::domain_error("ResultsView::altDepartmentId() is deprecated");
 }
 
 results::Department ResultsView::browseDepartment(const string& id)
@@ -314,7 +296,7 @@
 
 results::Department ResultsView::browseAltDepartment(const string& id)
 {
-    return p->browseDepartment(id, true);
+    throw std::domain_error("ResultsView::browseAltDepartment() is deprecated");
 }
 
 bool ResultsView::overrideCategoryJson(string const& categoryId, string const& json)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-11-30 09:23:32 +0000
+++ tests/CMakeLists.txt	2016-03-16 11:17:35 +0000
@@ -34,9 +34,12 @@
         add_test(NAME test${CLASSNAME}${_test} COMMAND ${testCommand})
         add_custom_target(${_test} ${testCommand})
         add_executable(${_test}Exec
-                       ${_test}.cpp 
+                       ${_test}.cpp
                        ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewModelInterface.h
                        ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopeInterface.h
+                       ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/FilterBaseInterface.h
+                       ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/OptionSelectorFilterInterface.h
+                       ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/OptionSelectorOptionsInterface.h
                        ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h
                       )
         qt5_use_modules(${_test}Exec Test Core Qml DBus)
@@ -57,7 +60,9 @@
 endmacro(run_tests)
 
 run_tests(
-    departmentstest
+    filterstest
+    filtersendtoendtest
+    optionselectorfiltertest
     favoritestest
     locationtest
     overviewtest

=== modified file 'tests/data/CMakeLists.txt'
--- tests/data/CMakeLists.txt	2016-02-04 11:43:34 +0000
+++ tests/data/CMakeLists.txt	2016-03-16 11:17:35 +0000
@@ -4,6 +4,7 @@
 add_subdirectory(mock-scope-double-nav)
 add_subdirectory(mock-scope-info)
 add_subdirectory(mock-scope-ttl)
+add_subdirectory(mock-scope-filters)
 add_subdirectory(mock-scope-manyresults)
 
 configure_file(Runtime.ini.in Runtime.ini @ONLY)

=== added directory 'tests/data/mock-scope-filters'
=== added file 'tests/data/mock-scope-filters/CMakeLists.txt'
--- tests/data/mock-scope-filters/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-filters/CMakeLists.txt	2016-03-16 11:17:35 +0000
@@ -0,0 +1,15 @@
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.6.15)
+
+set(SCOPES_BIN_DIR ${SCOPESLIB_LIBDIR})
+
+include_directories(${SCOPESLIB_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set(SCOPE_SOURCES
+    mock-scope-filters.cpp
+    )
+
+add_library(mock-scope-filters MODULE ${SCOPE_SOURCES})
+target_link_libraries(mock-scope-filters ${SCOPESLIB_LDFLAGS})
+
+configure_file(mock-scope-filters.ini.in mock-scope-filters.ini)

=== added file 'tests/data/mock-scope-filters/mock-scope-filters.cpp'
--- tests/data/mock-scope-filters/mock-scope-filters.cpp	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-filters/mock-scope-filters.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Pawel Stolowski <[e-mail]>
+ */
+
+#include <unity/scopes/CategorisedResult.h>
+#include <unity/scopes/OptionSelectorFilter.h>
+#include <unity/scopes/RangeInputFilter.h>
+#include <unity/scopes/ValueSliderFilter.h>
+#include <unity/scopes/ValueSliderLabels.h>
+#include <unity/scopes/ScopeBase.h>
+#include <unity/scopes/SearchReply.h>
+
+#include <sstream>
+
+#define EXPORT __attribute__ ((visibility ("default")))
+
+using namespace std;
+using namespace unity::scopes;
+
+class MyQuery : public SearchQueryBase
+{
+public:
+    MyQuery(CannedQuery const& query, SearchMetadata const& metadata) :
+        SearchQueryBase(query, metadata)
+    {
+    }
+
+    ~MyQuery()
+    {
+    }
+
+    virtual void cancelled() override
+    {
+    }
+
+    virtual void run(SearchReplyProxy const& reply) override
+    {
+        OptionSelectorFilter::UPtr filter1 = OptionSelectorFilter::create("f1", "Filter1");
+        if (query().query_string() == "test_primary_filter") {
+            filter1->set_display_hints(FilterBase::DisplayHints::Primary);
+        }
+
+        auto opt1 = filter1->add_option("o1", "Option1");
+        filter1->add_option("o2", "Option2");
+
+        RangeInputFilter::SPtr filter2 = RangeInputFilter::create("f2", Variant(2.0f), Variant::null(), "start", "", "", "end", "");
+
+        auto cat1 = reply->register_category("cat1", "Category 1", "");
+        CategorisedResult res1(cat1);
+        res1.set_uri("test:uri");
+
+        auto selected = filter1->active_options(query().filter_state());
+        if (selected.size() == 1) {
+            res1.set_title("result for option " + (*selected.begin())->id());
+        } else {
+            res1.set_title("result for: \"" + query().query_string() + "\"");
+        }
+
+        bool has_start_val = filter2->has_start_value(query().filter_state());
+        bool has_end_val = filter2->has_end_value(query().filter_state());
+
+        if (has_start_val || has_end_val)
+        {
+            res1.set_title("result for range: " +
+                    (has_start_val ? std::to_string(filter2->start_value(query().filter_state())) : "***") + " - " +
+                    (has_end_val ? std::to_string(filter2->end_value(query().filter_state())) : "***"));
+        }
+
+        ValueSliderFilter::SPtr filter3 = ValueSliderFilter::create("f3", 1, 99, 50, ValueSliderLabels("Min", "Max", {{33, "One third"}}));
+
+        Filters filters;
+        filters.push_back(std::move(filter1));
+        filters.push_back(std::move(filter2));
+        filters.push_back(std::move(filter3));
+
+        reply->push(filters, query().filter_state());
+        reply->push(res1);
+    }
+};
+
+class MyScope : public ScopeBase
+{
+public:
+    MyScope()
+    {
+    }
+
+    virtual SearchQueryBase::UPtr search(CannedQuery const& q, SearchMetadata const& metadata) override
+    {
+        return SearchQueryBase::UPtr(new MyQuery(q, metadata));
+    }
+
+    virtual PreviewQueryBase::UPtr preview(Result const&, ActionMetadata const&) override
+    {
+        return nullptr;
+    }
+};
+
+extern "C"
+{
+
+    EXPORT
+    unity::scopes::ScopeBase*
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_CREATE_FUNCTION()
+    {
+        return new MyScope;
+    }
+
+    EXPORT
+    void
+    // cppcheck-suppress unusedFunction
+    UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope_base)
+    {
+        delete scope_base;
+    }
+
+}

=== added file 'tests/data/mock-scope-filters/mock-scope-filters.ini.in'
--- tests/data/mock-scope-filters/mock-scope-filters.ini.in	1970-01-01 00:00:00 +0000
+++ tests/data/mock-scope-filters/mock-scope-filters.ini.in	2016-03-16 11:17:35 +0000
@@ -0,0 +1,8 @@
+[ScopeConfig]
+DisplayName = mock-scope-filters.DisplayName
+Description = mock-scope-filters.Description
+Art = /mock-scope-filters.Art
+Icon = /mock-scope-filters.Icon
+SearchHint = mock-scope-filters.SearchHint
+HotKey = mock-scope-filters.HotKey
+Author = mock-scope-filters.Author

=== modified file 'tests/departmentstest.cpp'
--- tests/departmentstest.cpp	2015-01-27 16:45:19 +0000
+++ tests/departmentstest.cpp	2016-03-16 11:17:35 +0000
@@ -70,7 +70,6 @@
         m_resultsView->setQuery("foo");
 
         QVERIFY(!m_resultsView->hasDepartments());
-        QVERIFY(!m_resultsView->hasAltDepartments());
     }
 
     void testRootDepartment()
@@ -79,7 +78,6 @@
         m_resultsView->setQuery("");
 
         QVERIFY(m_resultsView->hasDepartments());
-        QVERIFY(!m_resultsView->hasAltDepartments());
         QVERIFY(m_resultsView->departmentId().empty());
 
         auto departments = m_resultsView->browseDepartment();
@@ -228,7 +226,6 @@
         auto root = m_resultsView->browseDepartment();
 
         QVERIFY(m_resultsView->hasDepartments());
-        QVERIFY(m_resultsView->hasAltDepartments());
         QVERIFY(m_resultsView->departmentId().empty());
         QCOMPARE(m_resultsView->altDepartmentId(), string("featured"));
 
@@ -295,7 +292,6 @@
         auto root = m_resultsView->browseDepartment();
 
         QVERIFY(m_resultsView->hasDepartments());
-        QVERIFY(!m_resultsView->hasAltDepartments());
         QVERIFY(m_resultsView->departmentId().empty());
 
         QVERIFY_MATCHRESULT(

=== added file 'tests/filtersendtoendtest.cpp'
--- tests/filtersendtoendtest.cpp	1970-01-01 00:00:00 +0000
+++ tests/filtersendtoendtest.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ */
+
+#include <QSignalSpy>
+#include <QScopedPointer>
+#include <QTest>
+#include <scopes.h>
+#include <scope.h>
+#include "filters.h"
+#include "categories.h"
+#include "optionselectorfilter.h"
+#include "rangeinputfilter.h"
+#include "valuesliderfilter.h"
+#include <scope-harness/registry/pre-existing-registry.h>
+#include <scope-harness/test-utils.h>
+#include <unity/shell/scopes/CategoriesInterface.h>
+#include <unity/shell/scopes/OptionSelectorFilterInterface.h>
+
+#include <unity/scopes/OptionSelectorFilter.h>
+#include <unity/scopes/RangeInputFilter.h>
+#include <unity/scopes/ValueSliderFilter.h>
+
+using namespace unity::scopeharness;
+using namespace unity::scopeharness::registry;
+using namespace scopes_ng;
+namespace uss = unity::shell::scopes;
+
+// FIXME: use scope harness wrapper once it exposes filters
+class FiltersEndToEndTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void initTestCase()
+    {
+        m_registry.reset(new PreExistingRegistry(TEST_RUNTIME_CONFIG));
+        m_registry->start();
+    }
+
+    void cleanupTestCase()
+    {
+        m_registry.reset();
+    }
+
+    void init()
+    {
+        const QStringList favs {"scope://mock-scope-filters"};
+        TestUtils::setFavouriteScopes(favs);
+
+        m_scopes.reset(new Scopes(nullptr));
+
+        // wait till the registry spawns
+        QSignalSpy spy(m_scopes.data(), SIGNAL(loadedChanged()));
+        QVERIFY(spy.wait());
+        QCOMPARE(m_scopes->loaded(), true);
+
+        // get scope proxy
+        m_scope = m_scopes->getScopeById("mock-scope-filters");
+        QVERIFY(m_scope != nullptr);
+        m_scope->setActive(true);
+    }
+
+    void cleanup()
+    {
+        m_scopes.reset();
+        m_scope.reset();
+    }
+
+    void testBasic()
+    {
+        TestUtils::performSearch(m_scope, "");
+
+        QCOMPARE(m_scope->primaryNavigationTag(), QString(""));
+        QVERIFY(m_scope->primaryNavigationFilter() == nullptr);
+
+        auto filters = m_scope->filters();
+        QVERIFY(filters != nullptr);
+        QCOMPARE(filters->rowCount(), 3);
+
+        auto idx = filters->index(0, 0);
+        QCOMPARE(filters->data(idx, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f1"));
+        idx = filters->index(1, 0);
+        QCOMPARE(filters->data(idx, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f2"));
+        idx = filters->index(2, 0);
+        QCOMPARE(filters->data(idx, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f3"));
+    }
+
+    void testOptionSelectorFilter()
+    {
+        TestUtils::performSearch(m_scope, "");
+
+        auto categories = m_scope->categories();
+        QVERIFY(categories != nullptr);
+        auto results = categories->data(categories->index(0, 0),
+                Categories::RoleResultsSPtr).value<QSharedPointer<unity::shell::scopes::ResultsModelInterface>>();
+        QVERIFY(results != nullptr);
+
+        auto filters = m_scope->filters();
+        QVERIFY(filters != nullptr);
+        QCOMPARE(filters->rowCount(), 3);
+
+        auto idx = filters->index(0, 0);
+        auto f1 = filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<OptionSelectorFilter*>();
+        QVERIFY(f1 != nullptr);
+
+        // check options
+        auto opts = f1->options();
+        QVERIFY(opts != nullptr);
+        QCOMPARE(opts->rowCount(), 2);
+
+        QCOMPARE(f1->filterId(), QString("f1"));
+        QCOMPARE(f1->label(), QString("Filter1"));
+        QVERIFY(!f1->multiSelect());
+
+        idx = opts->index(0, 0);
+        QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("o1"));
+        QVERIFY(!opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool());
+        idx = opts->index(1, 0);
+        QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("o2"));
+        QVERIFY(!opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool());
+
+        // select option 1
+        opts->setChecked(0, true);
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+        QCOMPARE(filters, m_scope->filters());
+        QCOMPARE(results->data(results->index(0, 0), unity::shell::scopes::ResultsModelInterface::RoleTitle).toString(), QString("result for option o1"));
+
+        // select option 2
+        opts->setChecked(1, true);
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+        QCOMPARE(filters, m_scope->filters());
+        QCOMPARE(results->data(results->index(0, 0), unity::shell::scopes::ResultsModelInterface::RoleTitle).toString(), QString("result for option o2"));
+
+        // deselect option 2
+        opts->setChecked(1, false);
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+        QCOMPARE(results->data(results->index(0, 0), unity::shell::scopes::ResultsModelInterface::RoleTitle).toString(), QString("result for: \"\""));
+
+        QCOMPARE(filters, m_scope->filters());
+    }
+
+    void testPrimaryFilter()
+    {
+        TestUtils::performSearch(m_scope, "test_primary_filter");
+
+        auto filters = m_scope->filters();
+        QVERIFY(filters != nullptr);
+        QCOMPARE(filters->rowCount(), 2);
+
+        auto idx = filters->index(0, 0);
+        QCOMPARE(filters->data(idx, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f2"));
+        idx = filters->index(1, 0);
+        QCOMPARE(filters->data(idx, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f3"));
+
+        auto f1 = dynamic_cast<unity::shell::scopes::OptionSelectorFilterInterface *>(m_scope->primaryNavigationFilter());
+        QVERIFY(f1 != nullptr);
+        QCOMPARE(f1->filterId(), QString("f1"));
+
+        auto opts = f1->options();
+
+        // select option 1
+        opts->setChecked(0, true);
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+
+        QCOMPARE(m_scope->primaryNavigationTag(), QString("Option1"));
+    }
+
+    void testRangeInputFilter()
+    {
+        TestUtils::performSearch(m_scope, "");
+
+        auto categories = m_scope->categories();
+        QVERIFY(categories != nullptr);
+        auto results = categories->data(categories->index(0, 0),
+                Categories::RoleResultsSPtr).value<QSharedPointer<unity::shell::scopes::ResultsModelInterface>>();
+        QVERIFY(results != nullptr);
+
+        auto filters = m_scope->filters();
+        QVERIFY(filters != nullptr);
+        QCOMPARE(filters->rowCount(), 3);
+
+        auto idx = filters->index(1, 0);
+        auto f2 = filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<RangeInputFilter*>();
+        QVERIFY(f2 != nullptr);
+
+        QCOMPARE(f2->hasStartValue(), true);
+        QCOMPARE(f2->hasEndValue(), false);
+
+        {
+            f2->setStartValue(111.0f);
+            TestUtils::waitForFilterStateChange(m_scope);
+            TestUtils::waitForSearchFinish(m_scope);
+
+            QCOMPARE(filters, m_scope->filters());
+            QCOMPARE(f2->hasStartValue(), true);
+            QCOMPARE(f2->hasEndValue(), false);
+
+            auto resultIdx = filters->index(0, 0);
+            QCOMPARE(results->data(resultIdx, unity::shell::scopes::ResultsModelInterface::RoleTitle).toString(), QString("result for range: 111.000000 - ***"));
+        }
+
+        {
+            QCOMPARE(f2, filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<RangeInputFilter*>());
+            f2->setEndValue(300.5f);
+            TestUtils::waitForFilterStateChange(m_scope);
+            TestUtils::waitForSearchFinish(m_scope);
+
+            QCOMPARE(f2->hasStartValue(), true);
+            QCOMPARE(f2->hasEndValue(), true);
+
+            auto resultIdx = filters->index(0, 0);
+            QCOMPARE(filters, m_scope->filters());
+            QCOMPARE(results->data(resultIdx, unity::shell::scopes::ResultsModelInterface::RoleTitle).toString(), QString("result for range: 111.000000 - 300.500000"));
+        }
+
+        // erase start value, end value still present
+        {
+            f2->eraseStartValue();
+            TestUtils::waitForFilterStateChange(m_scope);
+            TestUtils::waitForSearchFinish(m_scope);
+
+            QCOMPARE(filters, m_scope->filters());
+            QCOMPARE(f2->hasStartValue(), false);
+            QCOMPARE(f2->hasEndValue(), true);
+
+            auto resultIdx = filters->index(0, 0);
+            QCOMPARE(results->data(resultIdx, unity::shell::scopes::ResultsModelInterface::RoleTitle).toString(), QString("result for range: *** - 300.500000"));
+        }
+    }
+
+    void testValueSliderFilter()
+    {
+        TestUtils::performSearch(m_scope, "");
+
+        auto categories = m_scope->categories();
+        QVERIFY(categories != nullptr);
+        auto results = categories->data(categories->index(0, 0),
+                Categories::RoleResultsSPtr).value<QSharedPointer<unity::shell::scopes::ResultsModelInterface>>();
+        QVERIFY(results != nullptr);
+
+        auto filters = m_scope->filters();
+        QVERIFY(filters != nullptr);
+        QCOMPARE(filters->rowCount(), 3);
+
+        auto idx = filters->index(2, 0);
+        auto f3 = filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<ValueSliderFilter*>();
+        QVERIFY(f3 != nullptr);
+
+        QCOMPARE(static_cast<int>(f3->minValue()), 1);
+        QCOMPARE(static_cast<int>(f3->maxValue()), 99);
+        QCOMPARE(static_cast<int>(f3->value()), 50);
+
+        auto valuesModel = f3->values();
+        QVERIFY(valuesModel != nullptr);
+
+        QCOMPARE(valuesModel->rowCount(), 3);
+        QCOMPARE(valuesModel->data(valuesModel->index(0, 0), uss::ValueSliderValuesInterface::Roles::RoleValue).toInt(), 1);
+        QCOMPARE(valuesModel->data(valuesModel->index(0, 0), uss::ValueSliderValuesInterface::Roles::RoleLabel).toString(), QString("Min"));
+        QCOMPARE(valuesModel->data(valuesModel->index(1, 0), uss::ValueSliderValuesInterface::Roles::RoleValue).toInt(), 33);
+        QCOMPARE(valuesModel->data(valuesModel->index(1, 0), uss::ValueSliderValuesInterface::Roles::RoleLabel).toString(), QString("One third"));
+        QCOMPARE(valuesModel->data(valuesModel->index(2, 0), uss::ValueSliderValuesInterface::Roles::RoleValue).toInt(), 99);
+        QCOMPARE(valuesModel->data(valuesModel->index(2, 0), uss::ValueSliderValuesInterface::Roles::RoleLabel).toString(), QString("Max"));
+
+        f3->setValue(75);
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+
+        QCOMPARE(filters->rowCount(), 3);
+
+        // filter object shouldn't be recreated
+        QCOMPARE(filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<ValueSliderFilter*>(), f3);
+
+        QCOMPARE(filters, m_scope->filters());
+        QCOMPARE(static_cast<int>(f3->value()), 75);
+    }
+
+    void testResetToDefault()
+    {
+        TestUtils::performSearch(m_scope, "");
+
+        auto filters = m_scope->filters();
+        QVERIFY(filters != nullptr);
+        QCOMPARE(filters->rowCount(), 3);
+
+        auto idx = filters->index(1, 0);
+        auto f2 = filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<RangeInputFilter*>();
+        QVERIFY(f2 != nullptr);
+        QCOMPARE(f2->startValue(), 2.0f); //QCOMPARE does fuzzy comparison for floats/doubles
+
+        idx = filters->index(2, 0);
+        auto f3 = filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<ValueSliderFilter*>();
+        QVERIFY(f3 != nullptr);
+        QCOMPARE(static_cast<int>(f3->value()), 50);
+        f2->setStartValue(5.0f);
+        f3->setValue(75);
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+        QCOMPARE(f2->startValue(), 5.0f);
+        QCOMPARE(static_cast<int>(f3->value()), 75);
+
+        m_scope->resetFilters();
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+        QCOMPARE(f2->startValue(), 2.0f); //QCOMPARE does fuzzy comparison for floats/doubles
+        QCOMPARE(static_cast<int>(f3->value()), 50);
+    }
+
+    void testCancel()
+    {
+        TestUtils::performSearch(m_scope, "");
+
+        auto filters = m_scope->filters();
+        QVERIFY(filters != nullptr);
+        QCOMPARE(filters->rowCount(), 3);
+
+        auto idx = filters->index(1, 0);
+        auto f2 = filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<RangeInputFilter*>();
+        QVERIFY(f2 != nullptr);
+
+        idx = filters->index(2, 0);
+        auto f3 = filters->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<ValueSliderFilter*>();
+        QVERIFY(f3 != nullptr);
+        QCOMPARE(static_cast<int>(f3->value()), 50);
+        f2->setStartValue(5.0f);
+        f3->setValue(75);
+        TestUtils::waitForFilterStateChange(m_scope);
+        TestUtils::waitForSearchFinish(m_scope);
+        QCOMPARE(f2->startValue(), 5.0f);
+        QCOMPARE(static_cast<int>(f3->value()), 75);
+
+        m_scope->resetPrimaryNavigationTag();
+
+        TestUtils::waitForSearchFinish(m_scope);
+        QCOMPARE(f2->startValue(), 2.0f); //QCOMPARE does fuzzy comparison for floats/doubles
+        QCOMPARE(static_cast<int>(f3->value()), 50);
+        QCOMPARE(QString(), m_scope->primaryNavigationTag());
+    }
+
+private:
+    QScopedPointer<Scopes> m_scopes;
+    Scope::Ptr m_scope;
+    Registry::UPtr m_registry;
+};
+
+QTEST_GUILESS_MAIN(FiltersEndToEndTest)
+#include <filtersendtoendtest.moc>

=== added file 'tests/filterstest.cpp'
--- tests/filterstest.cpp	1970-01-01 00:00:00 +0000
+++ tests/filterstest.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,230 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ */
+
+#include <QSignalSpy>
+#include <QScopedPointer>
+#include <QTest>
+#include <QList>
+#include "filters.h"
+#include "optionselectorfilter.h"
+
+#include <unity/scopes/OptionSelectorFilter.h>
+
+using namespace scopes_ng;
+namespace uss = unity::shell::scopes;
+
+class FiltersTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void init()
+    {
+        unity::scopes::FilterState filterState;
+        filtersModel.reset(new Filters(filterState));
+
+        f1 = unity::scopes::OptionSelectorFilter::create("f1", "Filter1", false);
+        f1o1 = f1->add_option("o1", "Option1");
+        f1o2 = f1->add_option("o2", "Option2");
+
+        f2 = unity::scopes::OptionSelectorFilter::create("f2", "Filter2", false);
+        f2o1 = f2->add_option("o1", "Option1");
+        f2o2 = f2->add_option("o2", "Option2");
+    }
+
+    void testFiltersModelInit()
+    {
+        unity::scopes::FilterState filterState;
+
+        QSignalSpy filtersSpy(filtersModel.data(), SIGNAL(rowsInserted(const QModelIndex&, int, int)));
+        {
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+            backendFilters.append(f1);
+
+            f1->update_state(filterState, f1o1, true);
+
+            filtersModel->update(backendFilters);
+            filtersModel->update(filterState);
+        }
+
+        QCOMPARE(filtersSpy.count(), 1); // 1 filter object added
+
+        // check filters model data
+        auto idx = filtersModel->index(0, 0);
+        QCOMPARE(filtersModel->rowCount(), 1);
+        QCOMPARE(filtersModel->data(idx, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f1"));
+        QCOMPARE(filtersModel->data(idx, unity::shell::scopes::FiltersInterface::Roles::RoleFilterType).toInt(),
+                static_cast<int>(unity::shell::scopes::FiltersInterface::FilterType::OptionSelectorFilter));
+
+        // get filter object from the model
+        auto opf = filtersModel->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<OptionSelectorFilter*>();
+        QVERIFY(opf != nullptr);
+        QCOMPARE(opf->filterId(), QString("f1"));
+        QCOMPARE(opf->label(), QString("Filter1"));
+        QVERIFY(!opf->multiSelect());
+    }
+
+    void testFiltersModelInsert()
+    {
+        QSignalSpy rowsInsertedSignal(filtersModel.data(), SIGNAL(rowsInserted(const QModelIndex&, int, int)));
+        QSignalSpy rowsRemovedSignal(filtersModel.data(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+        QSignalSpy rowsMovedSignal(filtersModel.data(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
+
+        {
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+            backendFilters.append(f1);
+
+            filtersModel->update(backendFilters);
+        }
+
+        QCOMPARE(rowsMovedSignal.count(), 0);
+        QCOMPARE(rowsRemovedSignal.count(), 0);
+        QCOMPARE(rowsInsertedSignal.count(), 1);
+        // verify arguments of rowsInsertedSignal
+        {
+            auto args = rowsInsertedSignal.takeFirst();
+            auto row = args.at(1).toInt();
+            QCOMPARE(row, 0);
+        }
+
+        rowsInsertedSignal.clear();
+
+        // insert new filter
+        {
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+            backendFilters.append(f1);
+            backendFilters.append(f2);
+
+            filtersModel->update(backendFilters);
+        }
+
+        QCOMPARE(rowsMovedSignal.count(), 0);
+        QCOMPARE(rowsRemovedSignal.count(), 0);
+        QCOMPARE(rowsInsertedSignal.count(), 1);
+        // verify arguments of rowsInsertedSignal
+        {
+            auto args = rowsInsertedSignal.takeFirst();
+            auto row = args.at(1).toInt();
+            QCOMPARE(row, 1);
+        }
+
+        auto idx1 = filtersModel->index(0, 0);
+        auto idx2 = filtersModel->index(1, 0);
+        QCOMPARE(filtersModel->rowCount(), 2);
+        QCOMPARE(filtersModel->data(idx1, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f1"));
+        QCOMPARE(filtersModel->data(idx2, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f2"));
+        QCOMPARE(filtersModel->data(idx2, unity::shell::scopes::FiltersInterface::Roles::RoleFilterType).toInt(),
+                static_cast<int>(unity::shell::scopes::FiltersInterface::FilterType::OptionSelectorFilter));
+
+    }
+
+    void testFiltersModelMove()
+    {
+        {
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+            backendFilters.append(f1);
+            backendFilters.append(f2);
+
+            filtersModel->update(backendFilters);
+        }
+
+        QSignalSpy rowsInsertedSignal(filtersModel.data(), SIGNAL(rowsInserted(const QModelIndex&, int, int)));
+        QSignalSpy rowsRemovedSignal(filtersModel.data(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+        QSignalSpy rowsMovedSignal(filtersModel.data(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
+
+        // change filters positions
+        {
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+
+            backendFilters.append(f2);
+            backendFilters.append(f1);
+
+            filtersModel->update(backendFilters);
+        }
+
+        QCOMPARE(rowsInsertedSignal.count(), 0); // no change
+        QCOMPARE(rowsRemovedSignal.count(), 0);
+        QCOMPARE(rowsMovedSignal.count(), 1);
+
+        QCOMPARE(filtersModel->rowCount(), 2);
+
+        auto idx1 = filtersModel->index(0, 0);
+        auto idx2 = filtersModel->index(1, 0);
+        QCOMPARE(filtersModel->data(idx1, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f2"));
+        QCOMPARE(filtersModel->data(idx2, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f1"));
+
+        // verify arguments of rowsMovedSignal
+        {
+            auto args = rowsMovedSignal.takeFirst();
+            auto srcRow = args.at(1).toInt();
+            auto dstRow = args.at(4).toInt();
+            QCOMPARE(srcRow, 0);
+            QCOMPARE(dstRow, 2);
+        }
+    }
+
+    void testFiltersModelRemove()
+    {
+        {
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+            backendFilters.append(f2);
+            backendFilters.append(f1);
+
+            filtersModel->update(backendFilters);
+        }
+
+        QSignalSpy rowsInsertedSignal(filtersModel.data(), SIGNAL(rowsInserted(const QModelIndex&, int, int)));
+        QSignalSpy rowsRemovedSignal(filtersModel.data(), SIGNAL(rowsRemoved(const QModelIndex&, int, int)));
+        QSignalSpy rowsMovedSignal(filtersModel.data(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)));
+
+        // remove a filter
+        {
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+            backendFilters.append(f2); // filter1 not present (removed)
+
+            filtersModel->update(backendFilters);
+        }
+
+        QCOMPARE(rowsInsertedSignal.count(), 0);
+        QCOMPARE(rowsMovedSignal.count(), 0);
+        QCOMPARE(rowsRemovedSignal.count(), 1);
+        // verify arguments of rowsRemovedSignal
+        {
+            auto args = rowsRemovedSignal.takeFirst();
+            auto first = args.at(1).toInt();
+            auto last = args.at(2).toInt();
+            QCOMPARE(first, 1);
+            QCOMPARE(last, 1);
+        }
+
+        QCOMPARE(filtersModel->rowCount(), 1);
+
+        auto idx1 = filtersModel->index(0, 0);
+        QCOMPARE(filtersModel->data(idx1, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f2"));
+    }
+
+private:
+    QScopedPointer<Filters> filtersModel;
+    unity::scopes::OptionSelectorFilter::SPtr f1, f2;
+    unity::scopes::FilterOption::SCPtr f1o1, f1o2, f2o1, f2o2;
+};
+
+QTEST_GUILESS_MAIN(FiltersTest)
+#include <filterstest.moc>

=== added file 'tests/optionselectorfiltertest.cpp'
--- tests/optionselectorfiltertest.cpp	1970-01-01 00:00:00 +0000
+++ tests/optionselectorfiltertest.cpp	2016-03-16 11:17:35 +0000
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *  Pawel Stolowski <[e-mail]>
+ */
+
+#include <QSignalSpy>
+#include <QScopedPointer>
+#include <QTest>
+#include <QList>
+#include "filters.h"
+#include "optionselectorfilter.h"
+
+#include <unity/scopes/OptionSelectorFilter.h>
+
+using namespace scopes_ng;
+namespace uss = unity::shell::scopes;
+
+class OptionSelectorFilterTest: public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+
+    void init()
+    {
+        unity::scopes::FilterState filterState;
+        filtersModel.reset(new Filters(filterState));
+
+        f1 = unity::scopes::OptionSelectorFilter::create("f1", "Filter1", false);
+        f1o1 = f1->add_option("f1o1", "Option1");
+        f1o2 = f1->add_option("f1o2", "Option2");
+
+        f2 = unity::scopes::OptionSelectorFilter::create("f2", "Filter2", true);
+        f2o1 = f2->add_option("f2o1", "Option1");
+        f2o2 = f2->add_option("f2o2", "Option2");
+
+        backendFilters.clear();
+        backendFilters.append(f1);
+        backendFilters.append(f2);
+        filtersModel->update(backendFilters);
+
+        f1->update_state(filterState, f1o1, true);
+
+        filtersModel->update(filterState);
+    }
+
+    void testOptions()
+    {
+        // check filters model data
+        auto idx1 = filtersModel->index(0, 0);
+        auto idx2 = filtersModel->index(1, 0);
+
+        QCOMPARE(filtersModel->rowCount(), 2);
+        QCOMPARE(filtersModel->data(idx1, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f1"));
+        QCOMPARE(filtersModel->data(idx1, unity::shell::scopes::FiltersInterface::Roles::RoleFilterType).toInt(),
+                static_cast<int>(unity::shell::scopes::FiltersInterface::FilterType::OptionSelectorFilter));
+        QCOMPARE(filtersModel->data(idx1, unity::shell::scopes::FiltersInterface::Roles::RoleFilterId).toString(), QString("f1"));
+        QCOMPARE(filtersModel->data(idx1, unity::shell::scopes::FiltersInterface::Roles::RoleFilterType).toInt(),
+                static_cast<int>(unity::shell::scopes::FiltersInterface::FilterType::OptionSelectorFilter));
+
+        {
+            // get 1st option selector filter
+            auto opf = filtersModel->data(idx1, uss::FiltersInterface::Roles::RoleFilter).value<OptionSelectorFilter*>();
+            QVERIFY(opf != nullptr);
+            QCOMPARE(opf->filterId(), QString("f1"));
+            QCOMPARE(opf->label(), QString("Filter1"));
+            QVERIFY(!opf->multiSelect());
+
+            // check options
+            auto opts = opf->options();
+            QVERIFY(opts != nullptr);
+            QCOMPARE(opts->rowCount(), 2);
+
+            auto idx = opts->index(0, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f1o1"));
+            QVERIFY(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool()); // option1 is checked
+            idx = opts->index(1, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f1o2"));
+            QVERIFY(!opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool());
+        }
+
+        {
+            // get 2nd option selector filter
+            auto opf = filtersModel->data(idx2, uss::FiltersInterface::Roles::RoleFilter).value<OptionSelectorFilter*>();
+            QVERIFY(opf != nullptr);
+            QCOMPARE(opf->filterId(), QString("f2"));
+            QCOMPARE(opf->label(), QString("Filter2"));
+            QVERIFY(opf->multiSelect());
+
+            // check options
+            auto opts = opf->options();
+            QVERIFY(opts != nullptr);
+            QCOMPARE(opts->rowCount(), 2);
+
+            auto idx = opts->index(0, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f2o1"));
+            QVERIFY(!opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool());
+            idx = opts->index(1, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f2o2"));
+            QVERIFY(!opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool());
+        }
+    }
+
+    void testBackendCheckedStateChange()
+    {
+        auto idx1 = filtersModel->index(0, 0);
+        {
+            // get 1st option selector filter
+            auto opf = filtersModel->data(idx1, uss::FiltersInterface::Roles::RoleFilter).value<OptionSelectorFilter*>();
+            QVERIFY(opf != nullptr);
+            auto opts = opf->options();
+            QVERIFY(opts != nullptr);
+            QCOMPARE(opts->rowCount(), 2);
+
+            QSignalSpy dataChangedSignal(opts, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+            QSignalSpy stateChangeSignal(filtersModel.data(), SIGNAL(filterStateChanged()));
+
+            // enable second option (which disables 1st option)
+            f1->update_state(filterState, f1o2, true);
+            filtersModel->update(filterState);
+
+            QCOMPARE(dataChangedSignal.count(), 2);
+            QCOMPARE(stateChangeSignal.count(), 0); // change initiated by backend, so no state change signal
+
+            // verify arguments of dataChanged signal
+            {
+                auto args = dataChangedSignal.takeFirst();
+                auto topLeft = args.at(0).value<QModelIndex>();
+                auto roles = args.at(2).value<QVector<int>>();
+                QCOMPARE(topLeft.row(), 0);
+                QCOMPARE(roles[0], static_cast<int>(uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked));
+            }
+
+            auto idx = opts->index(0, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f1o1"));
+            QVERIFY(!opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool()); // option 1 is now off
+            idx = opts->index(1, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f1o2"));
+            QVERIFY(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool()); // option 2 is now on
+        }
+    }
+
+    void testBackendOptionLabelChange()
+    {
+        auto idx = filtersModel->index(1, 0);
+        {
+            // get 1st option selector filter
+            auto opf = filtersModel->data(idx, uss::FiltersInterface::Roles::RoleFilter).value<OptionSelectorFilter*>();
+            QVERIFY(opf != nullptr);
+            QCOMPARE(opf->filterId(), QString("f2"));
+            auto opts = opf->options();
+            QVERIFY(opts != nullptr);
+            QCOMPARE(opts->rowCount(), 2);
+
+            auto idx1 = opts->index(0, 0);
+            auto idx2 = opts->index(1, 0);
+            QCOMPARE(opts->data(idx1, uss::OptionSelectorOptionsInterface::Roles::RoleOptionLabel).toString(), QString("Option1"));
+            QCOMPARE(opts->data(idx2, uss::OptionSelectorOptionsInterface::Roles::RoleOptionLabel).toString(), QString("Option2"));
+
+            QSignalSpy dataChangedSignal(opts, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+            QSignalSpy stateChangeSignal(filtersModel.data(), SIGNAL(filterStateChanged()));
+
+            unity::scopes::OptionSelectorFilter::SPtr f3 = unity::scopes::OptionSelectorFilter::create("f2", "Filter2", true);
+            auto f3o1 = f3->add_option("f2o1", "Option1");
+            auto f3o2 = f3->add_option("f2o2", "UpdatedOption2");
+
+            QList<unity::scopes::FilterBase::SCPtr> backendFilters2;
+            backendFilters2.append(f1);
+            backendFilters2.append(f3);
+
+            // sync model with new backend filters
+            filtersModel->update(backendFilters2);
+
+            if (dataChangedSignal.empty()) {
+                QVERIFY(dataChangedSignal.wait());
+            }
+            QCOMPARE(dataChangedSignal.count(), 1);
+
+            QCOMPARE(opts->data(idx1, uss::OptionSelectorOptionsInterface::Roles::RoleOptionLabel).toString(), QString("Option1"));
+            QCOMPARE(opts->data(idx2, uss::OptionSelectorOptionsInterface::Roles::RoleOptionLabel).toString(), QString("UpdatedOption2"));
+
+            QCOMPARE(stateChangeSignal.count(), 0); // no state change signal
+
+            // verify arguments of dataChanged signal
+            {
+                auto args = dataChangedSignal.takeFirst();
+                auto topLeft = args.at(0).value<QModelIndex>();
+                auto roles = args.at(2).value<QVector<int>>();
+                QCOMPARE(topLeft.row(), 1);
+                QCOMPARE(roles[0], static_cast<int>(uss::OptionSelectorOptionsInterface::Roles::RoleOptionLabel));
+            }
+        }
+    }
+
+    void testUICheckedStateChange()
+    {
+        auto idx1 = filtersModel->index(0, 0);
+        {
+            // get 1st option selector filter
+            auto opf = filtersModel->data(idx1, uss::FiltersInterface::Roles::RoleFilter).value<OptionSelectorFilter*>();
+            QVERIFY(opf != nullptr);
+            auto opts = opf->options();
+            QVERIFY(opts != nullptr);
+            QCOMPARE(opts->rowCount(), 2);
+
+            QSignalSpy dataChangedSignal(opts, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
+            QSignalSpy stateChangeSignal(filtersModel.data(), SIGNAL(filterStateChanged()));
+
+            // enable second option (which disables 1st option)
+            opts->setChecked(1, true);
+
+            if (stateChangeSignal.empty()) {
+                stateChangeSignal.wait();
+            }
+            if (dataChangedSignal.empty()) {
+                dataChangedSignal.wait();
+            }
+            QCOMPARE(stateChangeSignal.count(), 1);
+            QCOMPARE(dataChangedSignal.count(), 2);
+
+            // verify arguments of dataChanged signal
+            {
+                auto args = dataChangedSignal.takeFirst();
+                auto topLeft = args.at(0).value<QModelIndex>();
+                auto roles = args.at(2).value<QVector<int>>();
+                QCOMPARE(topLeft.row(), 0);
+                QCOMPARE(roles[0], static_cast<int>(uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked));
+            }
+
+            auto idx = opts->index(0, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f1o1"));
+            QVERIFY(!opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool()); // option 1 is now off
+            idx = opts->index(1, 0);
+            QCOMPARE(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionId).toString(), QString("f1o2"));
+            QVERIFY(opts->data(idx, uss::OptionSelectorOptionsInterface::Roles::RoleOptionChecked).toBool()); // option 2 is now on
+        }
+
+    }
+
+private:
+    unity::scopes::FilterState filterState;
+    QScopedPointer<Filters> filtersModel;
+    unity::scopes::OptionSelectorFilter::SPtr f1, f2;
+    unity::scopes::FilterOption::SCPtr f1o1, f1o2, f2o1, f2o2;
+    QList<unity::scopes::FilterBase::SCPtr> backendFilters;
+};
+
+QTEST_GUILESS_MAIN(OptionSelectorFilterTest)
+#include <optionselectorfiltertest.moc>