added support for single entry pk

#fno-134 in progress