BOOK-436 smarter model queries to fix failing imports, change rake task to pad out four months of dates