Added new controls and logic, add search on goods