Revamped launch query to be much faster