fixes #920
Fix error when searching for pool that doesn't exist
fixes #1538
fixes #1484