fixed retain filter for limit to avail
bug fixes for avail filter
merge conflicts