fixes for search
and generated columns