database: added manual returns for "None" parameters