Minor bug fixes to entry format of names, queries implemented