MOBILE: Updated solution to detect event enables removing livequery library