Filter keywords by database type, fix ut