1. Extracted select content
2. Fixed issues with time zone