Add Tags WS + Few Fixes #16