Merge pull request #34 from lemurell/master

Fix bug introduced in last commit
Fix one more bug odf the same type
Merge branch 'master' of https://github.com/LMFDB/lmfdb