Fixed issue with "first click wont yield mine" functionality, resulting in some cleaning up of collection vs model logic