Added indexes.  Need pre-9.4 hack to make them functional.