changed query
added link to tags and better gif making part