Added empty check of emma.current_query