Entity dropdown fix