Change static to dynamic username lookup and added another ES filter