Hopefully fully functioning searching with updated UI