Renamed ConditionTag to Tag and improve REST mappings