CDB-3133 Fixed tags locking and type filters
Merge branch 'CDB-3133' of https://github.com/CartoDB/cartodb into CDB-3133