Fixed Maps api event listener
Replaced the old date forms with the new form