Modified hashtags and mentions to work with filters instead of service, removed some extra commented code, some minor code refactoring