Fixed null values in filters (for String) and added date filtering