added search filter
fixed overflow bug