Closes #78 by removing the empty query and putting the init date query in a more understandable place