fixed larval filtering. still has problem if choice is null