Mobile filtering  - fixes DEVELOPER-367