Pulled out tag limiting from cli legacy feature

Also took the opportunity to standardize the tag filter feature a little 
further.