Added filtering by tags

Change-Id: I0b4a005a5b4585478e32fb84b50b379a32f09d48
Merge "Added filtering by tags"