Tuning and added refresh on select button