Fixed autocompleters and cleaned up implementation

Signed-off-by: Mende Najdov <mende@bibliocommons.com>