improved exception handling
added more maps for filtering