Updated logic for showing, scroling and hiding entitySelect in picker