Refactor + added all tag filtering API calls