Missing queries affecting a fresn install, closes #1347 and #1346