Improved filtering for bot and added helpers