Fixed bug and optimized selection of users to trigger trigger for